From kevin at tyndur.org Sun Jan 2 12:33:22 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sun, 2 Jan 2011 12:33:22 +0100 Subject: [tyndur-devel] [PATCH v2 0/2] CD-Images mit GRUB 2 Message-ID: <1293968004-17825-1-git-send-email-kevin@tyndur.org> Für die armen von Ubuntu geplagten Benutzer eine Möglichkeit, immerhin irgendwas bootbares zu erstellen. Kann einer von den Betroffenen den Patch ausprobieren und ein Acked-by senden, falls das so tut? Johannes Pfeiffer (1): Bauen von CD-Images mit GRUB 2 Kevin Wolf (1): grub2_cdrom.cfg aufgeräumt Makefile | 17 +++++++++++---- build/config/grub2_cdrom.cfg | 17 +++++++++++++++ build/scripts/grub2_cdrom | 45 ++++++++++++++++++++++++++++++++++++++++++ buildmk.sh | 3 ++ 4 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 build/config/grub2_cdrom.cfg create mode 100755 build/scripts/grub2_cdrom From kevin at tyndur.org Sun Jan 2 12:33:23 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sun, 2 Jan 2011 12:33:23 +0100 Subject: [tyndur-devel] [PATCH v2 1/2] Bauen von CD-Images mit GRUB 2 In-Reply-To: <1293968004-17825-1-git-send-email-kevin@tyndur.org> References: <1293968004-17825-1-git-send-email-kevin@tyndur.org> Message-ID: <1293968004-17825-2-git-send-email-kevin@tyndur.org> From: Johannes Pfeiffer Signed-off-by: Johannes Pfeiffer Signed-off-by: Kevin Wolf --- Makefile | 17 +++++++++++---- build/config/grub2_cdrom.cfg | 19 +++++++++++++++++ build/scripts/grub2_cdrom | 45 ++++++++++++++++++++++++++++++++++++++++++ buildmk.sh | 3 ++ 4 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 build/config/grub2_cdrom.cfg create mode 100755 build/scripts/grub2_cdrom diff --git a/Makefile b/Makefile index 9b63409..93ddf9b 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PPC=fpc -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 ASM_BIN=nasm -fbin -O99 -BUILD_ROOT=/home/kevin/entwicklung/tyndur/build/output +BUILD_ROOT=/home/johannes/Programme/Tyndur/tyndur/build/output BUILD_DIR=$(BUILD_ROOT) AS=as -32 @@ -22,14 +22,18 @@ obj: subdirs: $(MAKE) --no-print-directory -sC doc - $(MAKE) --no-print-directory -sC patches $(MAKE) --no-print-directory -sC src -clean: - rm -f *.o *.a *.mod +clean_objs: + rm -f *.o *.a *.mod *.ppu link.res ppas.sh tyndur + +softclean: clean_objs + for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" softclean; fi done + +clean: clean_objs for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done -.SILENT: all makefiles subdirs obj clean clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd +.SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd clean: clean_root clean_root: @@ -49,6 +53,9 @@ image-hd: updateroot image-cdrom: updateroot build/scripts/image_cdrom +grub2-cdrom: updateroot + build/scripts/grub2_cdrom + test-qemu: image-floppy qemu -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log diff --git a/build/config/grub2_cdrom.cfg b/build/config/grub2_cdrom.cfg new file mode 100644 index 0000000..02f1c9a --- /dev/null +++ b/build/config/grub2_cdrom.cfg @@ -0,0 +1,19 @@ +#Boot timeout +timeout = 10 + +#boote standardmäßig die deutsche Version +default = 0 + +#deutsche Version +menuentry "Tyndur (Deutsch)" { + multiboot /boot/tyndur debug=s + module /modules/init boot=file:/ + module /modules/ata + module /modules/ext2 + module /modules/iso9660 + module /modules/pci + module /modules/ramoverlay + module /modules/console servmgr:/term servmgr:/term + module /modules/servmgr foo ata:/atapi10"|"iso9660:/ vterm:/vterm8/out ata iso9660 console pci ext2 ramoverlay + boot +} diff --git a/build/scripts/grub2_cdrom b/build/scripts/grub2_cdrom new file mode 100755 index 0000000..406b603 --- /dev/null +++ b/build/scripts/grub2_cdrom @@ -0,0 +1,45 @@ +# Copyright (c) 20010 The tyndur Project. All rights reserved. +# +# This code is derived from software contributed to the tyndur Project +# by Johannes Pfeiffer. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. All advertising materials mentioning features or use of this software +# must display the following acknowledgement: +# This product includes software developed by the tyndur Project +# and its contributors. +# 4. Neither the name of the tyndur Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#Konfigurationsdateien kopieren +cp build/config/grub2_cdrom.cfg build/root/boot/grub/grub.cfg +cp -r build/root-cdrom/config build/root/ +cp -r build/root-common/config build/root/ + +#CD Image erstellen +grub-mkrescue --output=build/images/grub2-cdrom-tyndur.iso build/root/ + +#Konfigurationsdateien wieder löschen +rm -r build/root/config +#Nachricht für den Fall, dass xorriso nicht installiert ist +echo "Falls es zu Error 127 während der Erstellung des CD-Images kommt, hilft es das Paket XORRISO zu installieren." diff --git a/buildmk.sh b/buildmk.sh index b9d4194..35df2d8 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -258,6 +258,9 @@ image-hd: updateroot image-cdrom: updateroot build/scripts/image_cdrom +grub2-cdrom: updateroot + build/scripts/grub2_cdrom + test-qemu: image-floppy $LOST_TOOLS_QEMU -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log -- 1.6.0.2 From kevin at tyndur.org Sun Jan 2 12:33:24 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sun, 2 Jan 2011 12:33:24 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_v2_2/2=5D_grub2=5Fcdrom=2Ecfg_a?= =?utf-8?q?ufger=C3=A4umt?= In-Reply-To: <1293968004-17825-1-git-send-email-kevin@tyndur.org> References: <1293968004-17825-1-git-send-email-kevin@tyndur.org> Message-ID: <1293968004-17825-3-git-send-email-kevin@tyndur.org> ! GRUB 2 findet es lustig (und flexibler!!11elf!), die Kommandozeile inkompatibel zum Rest der Welt zu übergeben und den Namen der Binary wegzulassen. Wir müssen den also in der Config verdoppeln... - ramoverlay und ext2 werden bei der GRUB2-CD nicht benutzt, sie ist readonly Signed-off-by: Kevin Wolf --- build/config/grub2_cdrom.cfg | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/build/config/grub2_cdrom.cfg b/build/config/grub2_cdrom.cfg index 02f1c9a..af35160 100644 --- a/build/config/grub2_cdrom.cfg +++ b/build/config/grub2_cdrom.cfg @@ -6,14 +6,12 @@ default = 0 #deutsche Version menuentry "Tyndur (Deutsch)" { - multiboot /boot/tyndur debug=s - module /modules/init boot=file:/ - module /modules/ata - module /modules/ext2 - module /modules/iso9660 - module /modules/pci - module /modules/ramoverlay - module /modules/console servmgr:/term servmgr:/term - module /modules/servmgr foo ata:/atapi10"|"iso9660:/ vterm:/vterm8/out ata iso9660 console pci ext2 ramoverlay + multiboot /boot/tyndur /boot/tyndur debug=s + module /modules/init /modules/init boot=file:/ + module /modules/ata /modules/ata + module /modules/iso9660 /modules/iso9660 + module /modules/pci /modules/pci + module /modules/console /modules/console servmgr:/term servmgr:/term + module /modules/servmgr /modules/servmgr ata:/atapi10"|"iso9660:/ vterm:/vterm8/out ata iso9660 console pci boot } -- 1.6.0.2 From kevin at tyndur.org Wed Jan 5 17:51:08 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Wed, 5 Jan 2011 17:51:08 +0100 Subject: [tyndur-devel] [PATCH] Bauen von Festplattenimages mit GRUB 2 Message-ID: <1294246268-24333-1-git-send-email-kevin@tyndur.org> From: kevin + Neues Makefile-Target grub2-hd Signed-off-by: Kevin Wolf --- Makefile | 5 +- build/scripts/grub2_hd | 154 ++++++++++++++++++++++++++++++++++++++++++++++++ buildmk.sh | 3 + config.sh | 1 + 4 files changed, 162 insertions(+), 1 deletions(-) create mode 100755 build/scripts/grub2_hd diff --git a/Makefile b/Makefile index 93ddf9b..a58a079 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PPC=fpc -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 ASM_BIN=nasm -fbin -O99 -BUILD_ROOT=/home/johannes/Programme/Tyndur/tyndur/build/output +BUILD_ROOT=/home/kevin/entwicklung/tyndur/build/output BUILD_DIR=$(BUILD_ROOT) AS=as -32 @@ -53,6 +53,9 @@ image-hd: updateroot image-cdrom: updateroot build/scripts/image_cdrom +grub2-hd: updateroot + build/scripts/grub2_hd + grub2-cdrom: updateroot build/scripts/grub2_cdrom diff --git a/build/scripts/grub2_hd b/build/scripts/grub2_hd new file mode 100755 index 0000000..b014a19 --- /dev/null +++ b/build/scripts/grub2_hd @@ -0,0 +1,154 @@ +#!/bin/bash + +# Copyright (c) 2008 The tyndur Project. All rights reserved. +# +# This code is derived from software contributed to the tyndur Project +# by Antoine Kaufmann. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. All advertising materials mentioning features or use of this software +# must display the following acknowledgement: +# This product includes software developed by the tyndur Project +# and its contributors. +# 4. Neither the name of the tyndur Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +ROOT=build/root +ROOT_COMMON=build/root-common +ROOT_HD=build/root-hd +ROOT_LOCAL=build/root-local +MOUNT=build/mnt +SUDO=sudo + +export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin + +export LOST_BUILDMK_ROOT="`pwd`" +source build/config/image_hd.sh +source config.sh + +die() +{ + echo $1 + exit -1 +} + +convert_menu_lst() +{ + sed -ie 's/^title \(.*\)$/menuentry "\1" {/' "$1" + sed -ie 's/^kernel \([^ ]\+\)\(.*\)$/ multiboot \1 \1 \2/' "$1" + sed -ie 's/^module \([^ ]\+\)\(.*\)$/ module \1 \1 \2/' "$1" + sed -ie 's/^boot$/}/' "$1" + sed -ie 's/|/\\|/' "$1" +} + +# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr +# dazu. +NEW=0 +if ! [ -f $IMAGE_PATH ]; then + # Leeres Image erstellen und formatieren + dd of=$IMAGE_PATH bs=$((1024 * 1024)) seek=$IMAGE_SIZE count=0 + build/scripts/create_partition $IMAGE_PATH + NEW=1 +fi + + +# Start und Ende der Partition einlesen +PARTITIONS="`build/scripts/get_partition $IMAGE_PATH`" +PART_START=`echo $PARTITIONS | awk '{print $1}'` +PART_SIZE=`echo $PARTITIONS | awk '{print $2}'` + +if [ $NEW -ne 0 ]; then + LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --sizelimit $(($PART_SIZE * 512)) -o $(($PART_START * 512)) --show` + if [ $? -ne 0 ]; then + die "Loop Device konnte nicht angelegt werden" + fi + + # Dateisystem erstellen + $SUDO $LOST_TOOLS_MKE2FS -T ext2 -F -q $LOOP_DEV || die "Dateisystem konnte nicht erstellt werden" + + $SUDO losetup -d $LOOP_DEV +fi + +# Partition mounten +mkdir -p $MOUNT +$SUDO mount $IMAGE_PATH $MOUNT -t ext2 -o loop,offset=$((${PART_START} * 512)) +$SUDO chmod 777 -R $MOUNT + +# Daten Kopieren +cp -rP --preserve=links,timestamps $ROOT/* $ROOT_COMMON/* $ROOT_HD/* $MOUNT/ +[ -d $ROOT_LOCAL ] && cp -rP --preserve=links,timestamps $ROOT_LOCAL/* $MOUNT/ + +# GRUB-Konfiguration kopieren +mkdir -p $MOUNT/boot/grub +rm -f $MOUNT/boot/grub/menu.lst +echo "insmod multiboot" >> $MOUNT/boot/grub/grub.cfg +if [ -e $MOUNT/boot/tyndur2 ]; then + cat build/config/grub_hd_kernel2.cfg >> $MOUNT/boot/grub/grub.cfg +fi +if [ -e $MOUNT/boot/tyndur ]; then + cat build/config/grub_hd.cfg >> $MOUNT/boot/grub/grub.cfg +fi + +convert_menu_lst $MOUNT/boot/grub/grub.cfg + +# Grub kopieren +if [ $NEW -ne 0 ]; then + xargs -isrc cp src $MOUNT/boot/grub <<-EOF + $LOST_GRUB2_MODULESDIR/boot.mod + $LOST_GRUB2_MODULESDIR/cat.mod + $LOST_GRUB2_MODULESDIR/configfile.mod + $LOST_GRUB2_MODULESDIR/crypto.mod + $LOST_GRUB2_MODULESDIR/extcmd.mod + $LOST_GRUB2_MODULESDIR/gzio.mod + $LOST_GRUB2_MODULESDIR/ls.mod + $LOST_GRUB2_MODULESDIR/mmap.mod + $LOST_GRUB2_MODULESDIR/multiboot.mod + $LOST_GRUB2_MODULESDIR/normal.mod + $LOST_GRUB2_MODULESDIR/relocator.mod + $LOST_GRUB2_MODULESDIR/terminal.mod + $LOST_GRUB2_MODULESDIR/video.mod +EOF +fi + +# Partition unmounten und loopback-Device freigeben +$SUDO umount $MOUNT +rmdir $MOUNT + + +# Grub installieren +if [ $NEW -ne 0 ]; then + LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --show` + if [ $? -ne 0 ]; then + die "Loop Device konnte nicht angelegt werden" + fi + + mkdir -p build/grub2 + echo "(img) $LOOP_DEV" > build/grub2/device.map + + cp $LOST_GRUB2_MODULESDIR/boot.img build/grub2/ + grub-mkimage -O i386-pc -o build/grub2/core.img ext2 biosdisk part_msdos minicmd + + $SUDO grub-setup -m build/grub2/device.map -d build/grub2 -r "(img,1)" "(img)" + + $SUDO losetup -d $LOOP_DEV +fi diff --git a/buildmk.sh b/buildmk.sh index 35df2d8..8361bea 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -258,6 +258,9 @@ image-hd: updateroot image-cdrom: updateroot build/scripts/image_cdrom +grub2-hd: updateroot + build/scripts/grub2_hd + grub2-cdrom: updateroot build/scripts/grub2_cdrom diff --git a/config.sh b/config.sh index 0ae1246..393e77f 100644 --- a/config.sh +++ b/config.sh @@ -3,6 +3,7 @@ COMPILER_PREFIX_AMD64= COMPILER_PREFIX_I386= LOST_TOOLS_PPC=fpc LOST_GRUB_STAGESDIR=/boot/grub +LOST_GRUB2_MODULESDIR=/usr/lib/grub/i386-pc LOST_TOOLS_GRUB=grub LOST_TOOLS_MKE2FS=/sbin/mke2fs LOST_TOOLS_QEMU=qemu -- 1.6.0.2 From christian.klahn at live.de Wed Jan 5 22:53:58 2011 From: christian.klahn at live.de (Christian Klahn) Date: Wed, 5 Jan 2011 22:53:58 +0100 Subject: [tyndur-devel] [PATCH] GRUB2 HD Image umount Fehler behoben Message-ID: ! das Script zum erstellen eines GRUB2 HD images gibt jetzt keinen Fehler mehr beim löschen des Mountpointes für das image aus. Ursache war ein nicht ganz abgeschlossener Zugriff auf den Mountpoint Signed-off-by: Christian Klahn -------------- nächster Teil -------------- Ein Dateianhang mit HTML-Daten wurde abgetrennt... URL: -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : 0001-GRUB2-HD-Image-umount-Fehler-behoben.patch Dateityp : text/x-patch Dateigröße : 955 bytes Beschreibung: nicht verfügbar URL : From shyxormz at asxsoft.de Thu Jan 6 09:23:54 2011 From: shyxormz at asxsoft.de (Patrick Pokatilo) Date: Thu, 6 Jan 2011 09:23:54 +0100 Subject: [tyndur-devel] [PATCH] SSE aktivieren, um #UD zu verhindern Message-ID: <1294302234-29719-1-git-send-email-shyxormz@asxsoft.de> + SSE wird während des init-Prozesses aktiviert, um etwaige #UD, die durch vom Compiler zur Optimierung oder zum Handling von 64 bit Integern eingefügte SSE Operation entstehen können, zu verhindern Signed-off-by: Patrick Pokatilo --- src/kernel2/src/init.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/src/kernel2/src/init.c b/src/kernel2/src/init.c index a4d16d5..fc9bebd 100644 --- a/src/kernel2/src/init.c +++ b/src/kernel2/src/init.c @@ -174,7 +174,30 @@ void init(int multiboot_magic, struct multiboot_info *boot_info, bool bsp) static volatile uint32_t cpus_arrived = 0; locked_increment(&cpus_arrived); while (cpus_arrived < cpu_count) asm("nop"); - + + // SSE aktivieren + // TODO: Buildscripts fixen? + #if CONFIG_ARCH == ARCH_AMD64 + asm volatile( + "movq %cr0, %rax;" + "andq $0xfffffffffffffffb, %rax;" + "orq $2, %rax;" + "movq %rax, %cr0;" + "movq %cr4, %rax;" + "orq $0x600, %rax;" + "movq %rax, %cr4;" + ); + #else + asm volatile( + "movl %cr0, %eax;" + "andl $0xfffffffb, %eax;" + "orl $2, %eax;" + "movl %eax, %cr0;" + "movl %cr4, %eax;" + "orl $0x600, %eax;" + "movl %eax, %cr4;" + ); + #endif static volatile lock_t vmm_lock = LOCK_LOCKED; // ACHTUNG: Hier besteht ein kleines Problem: Da in vmm_init der APIC -- 1.7.0.4 From kevin at tyndur.org Thu Jan 6 17:22:24 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Thu, 6 Jan 2011 17:22:24 +0100 Subject: [tyndur-devel] [PATCH] libc: ctype.h standardkonformer Message-ID: <1294330944-30278-1-git-send-email-kevin@tyndur.org> ! libc: Funktionen nur als static inline im Header anbieten ist nicht erlaubt, man muss auch dagegen linken können Signed-off-by: Kevin Wolf --- src/include/ctype.h | 85 ++++++++------------------------------------ src/lib/ctype.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 70 deletions(-) create mode 100644 src/lib/ctype.c diff --git a/src/include/ctype.h b/src/include/ctype.h index 817bedb..f777511 100644 --- a/src/include/ctype.h +++ b/src/include/ctype.h @@ -29,75 +29,20 @@ #ifndef _CTYPE_H_ #define _CTYPE_H_ -static inline int isprint(int c) -{ - return (c >= 0x20); -} - -static inline int iscntrl(int c) -{ - return (c < 0x20); -} - -static inline int isspace(int c) -{ - return (c == ' ' || c== '\n' || c == '\t' || c == '\r'); -} - -static inline int isblank(int c) -{ - return (c == ' ' ||c == '\t'); -} - -static inline int isdigit(int c) -{ - return (c >= '0' && c <= '9'); -} - -static inline int isalpha(int c) -{ - return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')); -} - -static inline int isalnum(int c) -{ - return (isdigit(c) || isalpha(c)); -} - -static inline int isxdigit(int c) -{ - return (isdigit(c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')); -} - -static inline int isupper(int c) -{ - return (c >= 'A' && c <= 'Z'); -} - -static inline int islower(int c) -{ - return (c >= 'a' && c <= 'z'); -} - -static inline int ispunct(int c) -{ - return (isprint(c) && !isspace(c) && !isalpha(c)); -} - -static inline int isgraph(int c) -{ - return (isprint(c) && !isspace(c)); -} - - -static inline int tolower(int c) -{ - return isupper(c) ? c + ('a' - 'A') : c; -} - -static inline int toupper(int c) -{ - return islower(c) ? c - ('a' - 'A') : c; -} +int isprint(int c); +int iscntrl(int c); +int isspace(int c); +int isblank(int c); +int isdigit(int c); +int isalpha(int c); +int isalnum(int c); +int isxdigit(int c); +int isupper(int c); +int islower(int c); +int ispunct(int c); +int isgraph(int c); + +int tolower(int c); +int toupper(int c); #endif /* ndef CTYPE_H */ diff --git a/src/lib/ctype.c b/src/lib/ctype.c new file mode 100644 index 0000000..d1e2928 --- /dev/null +++ b/src/lib/ctype.c @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2006-2010 The tyndur Project. All rights reserved. + * + * This code is derived from software contributed to the tyndur Project + * by Burkhard Weseloh. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +int isprint(int c) +{ + return (c >= 0x20); +} + +int iscntrl(int c) +{ + return (c < 0x20); +} + +int isspace(int c) +{ + return (c == ' ' || c== '\n' || c == '\t' || c == '\r'); +} + +int isblank(int c) +{ + return (c == ' ' ||c == '\t'); +} + +int isdigit(int c) +{ + return (c >= '0' && c <= '9'); +} + +int isalpha(int c) +{ + return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')); +} + +int isalnum(int c) +{ + return (isdigit(c) || isalpha(c)); +} + +int isxdigit(int c) +{ + return (isdigit(c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')); +} + +int isupper(int c) +{ + return (c >= 'A' && c <= 'Z'); +} + +int islower(int c) +{ + return (c >= 'a' && c <= 'z'); +} + +int ispunct(int c) +{ + return (isprint(c) && !isspace(c) && !isalpha(c)); +} + +int isgraph(int c) +{ + return (isprint(c) && !isspace(c)); +} + +int tolower(int c) +{ + return isupper(c) ? c + ('a' - 'A') : c; +} + +int toupper(int c) +{ + return islower(c) ? c - ('a' - 'A') : c; +} -- 1.6.0.2 From bluecoder at gmx.de Thu Jan 6 22:29:09 2011 From: bluecoder at gmx.de (=?UTF-8?q?J=C3=B6rg=20Pf=C3=A4hler?=) Date: Thu, 6 Jan 2011 22:29:09 +0100 Subject: [tyndur-devel] [PATCH 1/2] * BUILD_ROOT und den Pfad zu fpc von Makefile nach Makefile.local verschoben Message-ID: <1294349350-5110-1-git-send-email-bluecoder@gmx.de> --- .gitignore | 1 + Makefile | 8 +++++--- buildmk.sh | 13 ++++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a0467f1..efd738e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.o *.mod Makefile +Makefile.local *.a *.ppu link.res diff --git a/Makefile b/Makefile index a58a079..83ed21a 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ +-include Makefile.local + CC=gcc -m32 -g -c -fno-stack-protector -nostdinc -fno-leading-underscore -fno-omit-frame-pointer -Wall -Werror -Wstrict-prototypes -fno-strict-aliasing -O2 -fno-builtin -I . CPP=g++ -m32 -g -c -fno-stack-protector -fno-leading-underscore -fno-omit-frame-pointer -Wall -fno-strict-aliasing -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-use-cxa-atexit -O0 -PPC=fpc -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units +PPC=$(PPC_BIANRY) -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 ASM_BIN=nasm -fbin -O99 -BUILD_ROOT=/home/kevin/entwicklung/tyndur/build/output BUILD_DIR=$(BUILD_ROOT) AS=as -32 @@ -31,7 +32,8 @@ softclean: clean_objs for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" softclean; fi done clean: clean_objs - for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done + for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done + rm Makefile.local .SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd clean: clean_root diff --git a/buildmk.sh b/buildmk.sh index 8361bea..345e512 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -82,15 +82,21 @@ if [ -f Makefile.conf ]; then source Makefile.conf fi +cat < Makefile.local +BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output +PPC_BIANRY=$LOST_TOOLS_PPC +EOF + cat < Makefile +-include Makefile.local + CC=$LOST_TOOLS_GCC $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND CPP=$LOST_TOOLS_GPP $INCLUDES -PPC=$LOST_TOOLS_PPC -n -Cn -CX -Ttyndur $FPCINCLUDES -Fu../lib/units -Fu../units +PPC=\$(PPC_BIANRY) -n -Cn -CX -Ttyndur $FPCINCLUDES -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 $NASMINCLUDES ASM_BIN=nasm -fbin -O99 -BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output BUILD_DIR=`pwd | sed s#^$LOST_BUILDMK_ROOT#\$\(BUILD_ROOT\)#` AS=$LOST_TOOLS_AS @@ -232,7 +238,8 @@ softclean: clean_objs for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" softclean; fi done clean: clean_objs - for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done + for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done + rm Makefile.local .SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd EOF -- 1.7.1 From bluecoder at gmx.de Thu Jan 6 22:29:10 2011 From: bluecoder at gmx.de (=?UTF-8?q?J=C3=B6rg=20Pf=C3=A4hler?=) Date: Thu, 6 Jan 2011 22:29:10 +0100 Subject: [tyndur-devel] [PATCH 2/2] + Makefile: Target lbuilds-env In-Reply-To: <1294349350-5110-1-git-send-email-bluecoder@gmx.de> References: <1294349350-5110-1-git-send-email-bluecoder@gmx.de> Message-ID: <1294349350-5110-2-git-send-email-bluecoder@gmx.de> --- Makefile | 16 +++++++++++++++- buildmk.sh | 19 ++++++++++++++++++- config.sh | 2 +- src/include/lost/config.h | 2 +- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 83ed21a..bc59f46 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,20 @@ subdirs: $(MAKE) --no-print-directory -sC doc $(MAKE) --no-print-directory -sC src +.PHONY: lbuilds-env + +lbuilds-env: + if [ -d lbuilds ]; then cd lbuilds && git pull; else git clone git://git.tyndur.org/lbuilds.git lbuilds; fi + echo "\$$(eval \$$(NOBUILD))" > lbuilds/.nobuild + cd lbuilds && scripts/build_crosstools && scripts/update_env `dirname \`pwd\`` && ln -sf `pwd`/tmp/cross-fpc/fpc-2.4.0/rtl/ `dirname \`pwd\``/src/modules/pas/lib/rtl/include + make enable-pascal + +enable-pascal: + rm -f src/modules/pas/.nobuild + +disable-pascal: + echo "\$$(eval \$$(NOBUILD))" > src/modules/pas/.nobuild + clean_objs: rm -f *.o *.a *.mod *.ppu link.res ppas.sh tyndur @@ -35,7 +49,7 @@ clean: clean_objs for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done rm Makefile.local -.SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd +.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd clean: clean_root clean_root: diff --git a/buildmk.sh b/buildmk.sh index 345e512..dad2bf3 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -227,6 +227,23 @@ for file in *.c *.cpp *.asm *.pas *.S; do fi done +# Code für lbuilds +cat <> Makefile + +.PHONY: lbuilds-env + +lbuilds-env: + if [ -d lbuilds ]; then cd lbuilds && git pull; else git clone git://git.tyndur.org/lbuilds.git lbuilds; fi + echo "\\\$\$(eval \\\$\$(NOBUILD))" > lbuilds/.nobuild + cd lbuilds && scripts/build_crosstools && scripts/update_env \`dirname \\\`pwd\\\`\` && ln -sf \`pwd\`/tmp/cross-fpc/fpc-2.4.0/rtl/ \`dirname \\\`pwd\\\`\`/src/modules/pas/lib/rtl/include + make enable-pascal + +enable-pascal: + rm -f src/modules/pas/.nobuild + +disable-pascal: + echo "\\\$\$(eval \\\$\$(NOBUILD))" > src/modules/pas/.nobuild +EOF # Code für make clean cat <> Makefile @@ -241,7 +258,7 @@ clean: clean_objs for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done rm Makefile.local -.SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd +.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd EOF if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then diff --git a/config.sh b/config.sh index 393e77f..8693bcb 100644 --- a/config.sh +++ b/config.sh @@ -1,7 +1,7 @@ # Ab hier anpassen COMPILER_PREFIX_AMD64= COMPILER_PREFIX_I386= -LOST_TOOLS_PPC=fpc +LOST_TOOLS_PPC=$LOST_BUILDMK_ROOT/lbuilds/env/bin/fpc LOST_GRUB_STAGESDIR=/boot/grub LOST_GRUB2_MODULESDIR=/usr/lib/grub/i386-pc LOST_TOOLS_GRUB=grub diff --git a/src/include/lost/config.h b/src/include/lost/config.h index a4582b4..ad960c2 100644 --- a/src/include/lost/config.h +++ b/src/include/lost/config.h @@ -71,7 +71,7 @@ //%desc "Stubs in der LibC nicht benutzen" //%type "yesno" -#define CONFIG_LIBC_NO_STUBS +#undef CONFIG_LIBC_NO_STUBS #define TYNDUR_VERSION "0.2.2" -- 1.7.1 From bluecoder at gmx.de Thu Jan 6 22:49:42 2011 From: bluecoder at gmx.de (=?UTF-8?q?J=C3=B6rg=20Pf=C3=A4hler?=) Date: Thu, 6 Jan 2011 22:49:42 +0100 Subject: [tyndur-devel] [PATCH 1/2] * BUILD_ROOT und den Pfad zu fpc von Makefile nach Makefile.local verschoben Message-ID: <1294350583-5329-1-git-send-email-bluecoder@gmx.de> --- .gitignore | 1 + Makefile | 8 +++++--- buildmk.sh | 13 ++++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a0467f1..efd738e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.o *.mod Makefile +Makefile.local *.a *.ppu link.res diff --git a/Makefile b/Makefile index a58a079..83ed21a 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ +-include Makefile.local + CC=gcc -m32 -g -c -fno-stack-protector -nostdinc -fno-leading-underscore -fno-omit-frame-pointer -Wall -Werror -Wstrict-prototypes -fno-strict-aliasing -O2 -fno-builtin -I . CPP=g++ -m32 -g -c -fno-stack-protector -fno-leading-underscore -fno-omit-frame-pointer -Wall -fno-strict-aliasing -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-use-cxa-atexit -O0 -PPC=fpc -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units +PPC=$(PPC_BIANRY) -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 ASM_BIN=nasm -fbin -O99 -BUILD_ROOT=/home/kevin/entwicklung/tyndur/build/output BUILD_DIR=$(BUILD_ROOT) AS=as -32 @@ -31,7 +32,8 @@ softclean: clean_objs for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" softclean; fi done clean: clean_objs - for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done + for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done + rm Makefile.local .SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd clean: clean_root diff --git a/buildmk.sh b/buildmk.sh index 8361bea..345e512 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -82,15 +82,21 @@ if [ -f Makefile.conf ]; then source Makefile.conf fi +cat < Makefile.local +BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output +PPC_BIANRY=$LOST_TOOLS_PPC +EOF + cat < Makefile +-include Makefile.local + CC=$LOST_TOOLS_GCC $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND CPP=$LOST_TOOLS_GPP $INCLUDES -PPC=$LOST_TOOLS_PPC -n -Cn -CX -Ttyndur $FPCINCLUDES -Fu../lib/units -Fu../units +PPC=\$(PPC_BIANRY) -n -Cn -CX -Ttyndur $FPCINCLUDES -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 $NASMINCLUDES ASM_BIN=nasm -fbin -O99 -BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output BUILD_DIR=`pwd | sed s#^$LOST_BUILDMK_ROOT#\$\(BUILD_ROOT\)#` AS=$LOST_TOOLS_AS @@ -232,7 +238,8 @@ softclean: clean_objs for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" softclean; fi done clean: clean_objs - for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done + for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done + rm Makefile.local .SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd EOF -- 1.7.1 From bluecoder at gmx.de Thu Jan 6 22:49:43 2011 From: bluecoder at gmx.de (=?UTF-8?q?J=C3=B6rg=20Pf=C3=A4hler?=) Date: Thu, 6 Jan 2011 22:49:43 +0100 Subject: [tyndur-devel] [PATCH 2/2] + Makefile: Target lbuilds-env In-Reply-To: <1294350583-5329-1-git-send-email-bluecoder@gmx.de> References: <1294350583-5329-1-git-send-email-bluecoder@gmx.de> Message-ID: <1294350583-5329-2-git-send-email-bluecoder@gmx.de> --- Makefile | 16 +++++++++++++++- buildmk.sh | 19 ++++++++++++++++++- config.sh | 2 +- src/include/lost/config.h | 2 +- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 83ed21a..bc59f46 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,20 @@ subdirs: $(MAKE) --no-print-directory -sC doc $(MAKE) --no-print-directory -sC src +.PHONY: lbuilds-env + +lbuilds-env: + if [ -d lbuilds ]; then cd lbuilds && git pull; else git clone git://git.tyndur.org/lbuilds.git lbuilds; fi + echo "\$$(eval \$$(NOBUILD))" > lbuilds/.nobuild + cd lbuilds && scripts/build_crosstools && scripts/update_env `dirname \`pwd\`` && ln -sf `pwd`/tmp/cross-fpc/fpc-2.4.0/rtl/ `dirname \`pwd\``/src/modules/pas/lib/rtl/include + make enable-pascal + +enable-pascal: + rm -f src/modules/pas/.nobuild + +disable-pascal: + echo "\$$(eval \$$(NOBUILD))" > src/modules/pas/.nobuild + clean_objs: rm -f *.o *.a *.mod *.ppu link.res ppas.sh tyndur @@ -35,7 +49,7 @@ clean: clean_objs for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done rm Makefile.local -.SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd +.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd clean: clean_root clean_root: diff --git a/buildmk.sh b/buildmk.sh index 345e512..dad2bf3 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -227,6 +227,23 @@ for file in *.c *.cpp *.asm *.pas *.S; do fi done +# Code für lbuilds +cat <> Makefile + +.PHONY: lbuilds-env + +lbuilds-env: + if [ -d lbuilds ]; then cd lbuilds && git pull; else git clone git://git.tyndur.org/lbuilds.git lbuilds; fi + echo "\\\$\$(eval \\\$\$(NOBUILD))" > lbuilds/.nobuild + cd lbuilds && scripts/build_crosstools && scripts/update_env \`dirname \\\`pwd\\\`\` && ln -sf \`pwd\`/tmp/cross-fpc/fpc-2.4.0/rtl/ \`dirname \\\`pwd\\\`\`/src/modules/pas/lib/rtl/include + make enable-pascal + +enable-pascal: + rm -f src/modules/pas/.nobuild + +disable-pascal: + echo "\\\$\$(eval \\\$\$(NOBUILD))" > src/modules/pas/.nobuild +EOF # Code für make clean cat <> Makefile @@ -241,7 +258,7 @@ clean: clean_objs for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done rm Makefile.local -.SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd +.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd EOF if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then diff --git a/config.sh b/config.sh index 393e77f..8693bcb 100644 --- a/config.sh +++ b/config.sh @@ -1,7 +1,7 @@ # Ab hier anpassen COMPILER_PREFIX_AMD64= COMPILER_PREFIX_I386= -LOST_TOOLS_PPC=fpc +LOST_TOOLS_PPC=$LOST_BUILDMK_ROOT/lbuilds/env/bin/fpc LOST_GRUB_STAGESDIR=/boot/grub LOST_GRUB2_MODULESDIR=/usr/lib/grub/i386-pc LOST_TOOLS_GRUB=grub diff --git a/src/include/lost/config.h b/src/include/lost/config.h index a4582b4..ad960c2 100644 --- a/src/include/lost/config.h +++ b/src/include/lost/config.h @@ -71,7 +71,7 @@ //%desc "Stubs in der LibC nicht benutzen" //%type "yesno" -#define CONFIG_LIBC_NO_STUBS +#undef CONFIG_LIBC_NO_STUBS #define TYNDUR_VERSION "0.2.2" -- 1.7.1 From bluecoder at gmx.de Fri Jan 7 10:48:55 2011 From: bluecoder at gmx.de (=?UTF-8?q?J=C3=B6rg=20Pf=C3=A4hler?=) Date: Fri, 7 Jan 2011 10:48:55 +0100 Subject: [tyndur-devel] [PATCH] + Maketarget image-* erkennt automatisch ob grub legacy oder grub2 installiert ist Message-ID: <1294393735-30066-1-git-send-email-bluecoder@gmx.de> Signed-off-by: Jörg Pfähler --- Makefile | 17 ++--- build/scripts/grub2_cdrom | 45 ----------- build/scripts/grub2_hd | 154 -------------------------------------- build/scripts/image_cdrom | 135 --------------------------------- build/scripts/image_cdrom_grub1 | 135 +++++++++++++++++++++++++++++++++ build/scripts/image_cdrom_grub2 | 52 +++++++++++++ build/scripts/image_floppy | 86 --------------------- build/scripts/image_floppy_grub1 | 86 +++++++++++++++++++++ build/scripts/image_hd | 121 ------------------------------ build/scripts/image_hd_grub1 | 121 ++++++++++++++++++++++++++++++ build/scripts/image_hd_grub2 | 154 ++++++++++++++++++++++++++++++++++++++ buildmk.sh | 24 ++++--- 12 files changed, 569 insertions(+), 561 deletions(-) delete mode 100755 build/scripts/grub2_cdrom delete mode 100755 build/scripts/grub2_hd delete mode 100755 build/scripts/image_cdrom create mode 100755 build/scripts/image_cdrom_grub1 create mode 100755 build/scripts/image_cdrom_grub2 delete mode 100755 build/scripts/image_floppy create mode 100755 build/scripts/image_floppy_grub1 delete mode 100755 build/scripts/image_hd create mode 100755 build/scripts/image_hd_grub1 create mode 100755 build/scripts/image_hd_grub2 diff --git a/Makefile b/Makefile index adf7df3..4238fc9 100644 --- a/Makefile +++ b/Makefile @@ -61,26 +61,23 @@ updateroot: subdirs build/scripts/updateroot image-floppy: updateroot - build/scripts/image_floppy + build/scripts/image_floppy_$(GRUB_VERSION) image-hd: updateroot - build/scripts/image_hd + build/scripts/image_hd_$(GRUB_VERSION) image-cdrom: updateroot - build/scripts/image_cdrom + build/scripts/image_cdrom_$(GRUB_VERSION) -grub2-hd: updateroot - build/scripts/grub2_hd - -grub2-cdrom: updateroot - build/scripts/grub2_cdrom - -test-qemu: image-floppy +test-qemu-floppy: image-floppy qemu -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log test-qemu-hd: image-hd qemu -serial stdio -hda build/images/hd.img -net user -net nic,model=rtl8139 | tee qemu-serial.log +test-qemu-cdrom: image-cdrom + qemu -serial stdio -cdrom build/images/cdrom.img -boot d -net user -net nic,model=rtl8139 | tee qemu-serial.log + test-bochs: image-floppy bochs -f bochs.config diff --git a/build/scripts/grub2_cdrom b/build/scripts/grub2_cdrom deleted file mode 100755 index 406b603..0000000 --- a/build/scripts/grub2_cdrom +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 20010 The tyndur Project. All rights reserved. -# -# This code is derived from software contributed to the tyndur Project -# by Johannes Pfeiffer. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the tyndur Project -# and its contributors. -# 4. Neither the name of the tyndur Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#Konfigurationsdateien kopieren -cp build/config/grub2_cdrom.cfg build/root/boot/grub/grub.cfg -cp -r build/root-cdrom/config build/root/ -cp -r build/root-common/config build/root/ - -#CD Image erstellen -grub-mkrescue --output=build/images/grub2-cdrom-tyndur.iso build/root/ - -#Konfigurationsdateien wieder löschen -rm -r build/root/config -#Nachricht für den Fall, dass xorriso nicht installiert ist -echo "Falls es zu Error 127 während der Erstellung des CD-Images kommt, hilft es das Paket XORRISO zu installieren." diff --git a/build/scripts/grub2_hd b/build/scripts/grub2_hd deleted file mode 100755 index 9c0f5a8..0000000 --- a/build/scripts/grub2_hd +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2008 The tyndur Project. All rights reserved. -# -# This code is derived from software contributed to the tyndur Project -# by Antoine Kaufmann. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the tyndur Project -# and its contributors. -# 4. Neither the name of the tyndur Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -ROOT=build/root -ROOT_COMMON=build/root-common -ROOT_HD=build/root-hd -ROOT_LOCAL=build/root-local -MOUNT=build/mnt -SUDO=sudo - -export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin - -export LOST_BUILDMK_ROOT="`pwd`" -source build/config/image_hd.sh -source config.sh - -die() -{ - echo $1 - exit -1 -} - -convert_menu_lst() -{ - sed -ie 's/^title \(.*\)$/menuentry "\1" {/' "$1" - sed -ie 's/^kernel \([^ ]\+\)\(.*\)$/ multiboot \1 \1 \2/' "$1" - sed -ie 's/^module \([^ ]\+\)\(.*\)$/ module \1 \1 \2/' "$1" - sed -ie 's/^boot$/}/' "$1" - sed -ie 's/|/\\|/' "$1" -} - -# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr -# dazu. -NEW=0 -if ! [ -f $IMAGE_PATH ]; then - # Leeres Image erstellen und formatieren - dd of=$IMAGE_PATH bs=$((1024 * 1024)) seek=$IMAGE_SIZE count=0 - build/scripts/create_partition $IMAGE_PATH - NEW=1 -fi - - -# Start und Ende der Partition einlesen -PARTITIONS="`build/scripts/get_partition $IMAGE_PATH`" -PART_START=`echo $PARTITIONS | awk '{print $1}'` -PART_SIZE=`echo $PARTITIONS | awk '{print $2}'` - -if [ $NEW -ne 0 ]; then - LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --sizelimit $(($PART_SIZE * 512)) -o $(($PART_START * 512)) --show` - if [ $? -ne 0 ]; then - die "Loop Device konnte nicht angelegt werden" - fi - - # Dateisystem erstellen - $SUDO $LOST_TOOLS_MKE2FS -T ext2 -F -q $LOOP_DEV || die "Dateisystem konnte nicht erstellt werden" - - $SUDO losetup -d $LOOP_DEV -fi - -# Partition mounten -mkdir -p $MOUNT -$SUDO mount $IMAGE_PATH $MOUNT -t ext2 -o loop,offset=$((${PART_START} * 512)) -$SUDO chmod 777 -R $MOUNT - -# Daten Kopieren -cp -rP --preserve=links,timestamps $ROOT/* $ROOT_COMMON/* $ROOT_HD/* $MOUNT/ -[ -d $ROOT_LOCAL ] && cp -rP --preserve=links,timestamps $ROOT_LOCAL/* $MOUNT/ - -# GRUB-Konfiguration kopieren -mkdir -p $MOUNT/boot/grub -rm -f $MOUNT/boot/grub/grub.cfg -echo "insmod multiboot" >> $MOUNT/boot/grub/grub.cfg -if [ -e $MOUNT/boot/tyndur2 ]; then - cat build/config/grub_hd_kernel2.cfg >> $MOUNT/boot/grub/grub.cfg -fi -if [ -e $MOUNT/boot/tyndur ]; then - cat build/config/grub_hd.cfg >> $MOUNT/boot/grub/grub.cfg -fi - -convert_menu_lst $MOUNT/boot/grub/grub.cfg - -# Grub kopieren -if [ $NEW -ne 0 ]; then - xargs -isrc cp src $MOUNT/boot/grub <<-EOF - $LOST_GRUB2_MODULESDIR/boot.mod - $LOST_GRUB2_MODULESDIR/cat.mod - $LOST_GRUB2_MODULESDIR/configfile.mod - $LOST_GRUB2_MODULESDIR/crypto.mod - $LOST_GRUB2_MODULESDIR/extcmd.mod - $LOST_GRUB2_MODULESDIR/gzio.mod - $LOST_GRUB2_MODULESDIR/ls.mod - $LOST_GRUB2_MODULESDIR/mmap.mod - $LOST_GRUB2_MODULESDIR/multiboot.mod - $LOST_GRUB2_MODULESDIR/normal.mod - $LOST_GRUB2_MODULESDIR/relocator.mod - $LOST_GRUB2_MODULESDIR/terminal.mod - $LOST_GRUB2_MODULESDIR/video.mod -EOF -fi - -# Partition unmounten und loopback-Device freigeben -$SUDO umount $MOUNT -rmdir $MOUNT - - -# Grub installieren -if [ $NEW -ne 0 ]; then - LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --show` - if [ $? -ne 0 ]; then - die "Loop Device konnte nicht angelegt werden" - fi - - mkdir -p build/grub2 - echo "(img) $LOOP_DEV" > build/grub2/device.map - - cp $LOST_GRUB2_MODULESDIR/boot.img build/grub2/ - grub-mkimage -O i386-pc -o build/grub2/core.img ext2 biosdisk part_msdos minicmd - - $SUDO grub-setup -m build/grub2/device.map -d build/grub2 -r "(img,1)" "(img)" - - $SUDO losetup -d $LOOP_DEV -fi diff --git a/build/scripts/image_cdrom b/build/scripts/image_cdrom deleted file mode 100755 index e7233f2..0000000 --- a/build/scripts/image_cdrom +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2008-2009 The tyndur Project. All rights reserved. -# -# This code is derived from software contributed to the tyndur Project -# by Antoine Kaufmann. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the tyndur Project -# and its contributors. -# 4. Neither the name of the tyndur Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -ROOT=build/root -ROOT_COMMON=build/root-common -ROOT_CDROM=build/root-cdrom -ROOT_LOCAL=build/root-local - -STAGE2_ELTORITO=/usr/lib/grub/i386-pc/stage2_eltorito - -export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin - -source build/config/image_cdrom.sh -export LOST_BUILDMK_ROOT="`pwd`" -source config.sh - - -export MTOOLSRC=lostmtools.conf - -# Festplattenpartition kopieren -if [ ! -f $HD_IMAGE_PATH ]; then - echo "Benoetige ein Festplattenimage" - exit 1 -fi - - -PARTITIONS="`build/scripts/get_partition $HD_IMAGE_PATH`" -PART_START=`echo $PARTITIONS | awk '{print $1}'` - -dd if=$HD_IMAGE_PATH of=$ROOT_CDROM/hd.img skip=$PART_START - - -# CD bauen - -if [ -f $STAGE2_ELTORITO ]; then # Eltorito - - mkdir -p $ROOT/boot/grub - cp $STAGE2_ELTORITO $ROOT/boot/grub/stage2_eltorito - cp build/config/grub_cdrom_eltorito.cfg $ROOT/boot/grub/menu.lst - - # Fix für uppercase-Pfade in ISO9660-Dateisystemen. - # Ohne wird grub die menu.lst nicht finden. - sed -i "s/boot\/grub\/menu.lst/BOOT\/GRUB\/MENU.LST/g" $ROOT/boot/grub/stage2_eltorito - - mkisofs -b boot/grub/stage2_eltorito -no-emul-boot \ - -boot-load-size 4 -boot-info-table -m .svn -o $IMAGE_PATH \ - $ROOT $ROOT_COMMON $ROOT_CDROM - - echo "CD-Image erfolgreich erstellt!" - echo "Verwendete Methode: Eltorito" - exit -fi - -# Floppy-Emulation - -# Konfigurationsdatei fuer mtools generieren -cat << EOF > $MTOOLSRC -drive l: - file="$FLOPPY_IMAGE_PATH" cylinders=80 heads=2 sectors=18 filter -EOF - -# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr -# dazu. -NEW=0 -if ! [ -f $FLOPPY_IMAGE_PATH ]; then - # Leeres Image erstellen und formatieren - dd of=$FLOPPY_IMAGE_PATH bs=1024 seek=1440 count=0 - mformat l: - NEW=1 -fi - - -if [ $NEW -ne 0 ]; then - # Grub kopieren und installieren - mmd -D s l:/boot - mmd -D s l:/boot/grub - mcopy -D o $LOST_GRUB_STAGESDIR/stage? l:/boot/grub/ - - $LOST_TOOLS_GRUB --batch < $MTOOLSRC +drive l: + file="$FLOPPY_IMAGE_PATH" cylinders=80 heads=2 sectors=18 filter +EOF + +# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr +# dazu. +NEW=0 +if ! [ -f $FLOPPY_IMAGE_PATH ]; then + # Leeres Image erstellen und formatieren + dd of=$FLOPPY_IMAGE_PATH bs=1024 seek=1440 count=0 + mformat l: + NEW=1 +fi + + +if [ $NEW -ne 0 ]; then + # Grub kopieren und installieren + mmd -D s l:/boot + mmd -D s l:/boot/grub + mcopy -D o $LOST_GRUB_STAGESDIR/stage? l:/boot/grub/ + + $LOST_TOOLS_GRUB --batch < $MTOOLSRC -drive l: - file="$IMAGE_PATH" cylinders=80 heads=2 sectors=18 filter -EOF - -# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr -# dazu. -NEW=0 -if ! [ -f $IMAGE_PATH ]; then - # Leeres Image erstellen und formatieren - dd of=$IMAGE_PATH bs=1024 seek=1440 count=0 - mformat l: - NEW=1 -fi - - -mcopy -D o -s $ROOT/* $ROOT_COMMON/* $ROOT_FLOPPY/* l:/ -mcopy -D o -s $ROOT_LOCAL/* l:/ - -# Grub-Konfiguration kopieren -mcopy -D o build/config/grub_floppy.cfg l:/boot/grub/menu.lst - -if [ $NEW -ne 0 ]; then - # Grub kopieren und installieren - mmd -D s l:/boot/grub - mcopy -D o $LOST_GRUB_STAGESDIR/stage? l:/boot/grub/ - - $LOST_TOOLS_GRUB --batch < $MTOOLSRC +drive l: + file="$IMAGE_PATH" cylinders=80 heads=2 sectors=18 filter +EOF + +# Wenn das Image neu erstellt werden muss, kommen noch ein paar schritte mehr +# dazu. +NEW=0 +if ! [ -f $IMAGE_PATH ]; then + # Leeres Image erstellen und formatieren + dd of=$IMAGE_PATH bs=1024 seek=1440 count=0 + mformat l: + NEW=1 +fi + + +mcopy -D o -s $ROOT/* $ROOT_COMMON/* $ROOT_FLOPPY/* l:/ +mcopy -D o -s $ROOT_LOCAL/* l:/ + +# Grub-Konfiguration kopieren +mcopy -D o build/config/grub_floppy.cfg l:/boot/grub/menu.lst + +if [ $NEW -ne 0 ]; then + # Grub kopieren und installieren + mmd -D s l:/boot/grub + mcopy -D o $LOST_GRUB_STAGESDIR/stage? l:/boot/grub/ + + $LOST_TOOLS_GRUB --batch <> $MOUNT/boot/grub/menu.lst -fi -if [ -e $MOUNT/boot/tyndur ]; then - cat build/config/grub_hd.cfg >> $MOUNT/boot/grub/menu.lst -fi - - -# Grub kopieren -if [ $NEW -ne 0 ]; then - cp $LOST_GRUB_STAGESDIR/stage? $MOUNT/boot/grub/ -fi - -# Partition unmounten und loopback-Device freigeben -$SUDO umount $MOUNT -rmdir $MOUNT - - -# Grub installieren -if [ $NEW -ne 0 ]; then - $LOST_TOOLS_GRUB --no-floppy --batch > /dev/null <> $MOUNT/boot/grub/menu.lst +fi +if [ -e $MOUNT/boot/tyndur ]; then + cat build/config/grub_hd.cfg >> $MOUNT/boot/grub/menu.lst +fi + + +# Grub kopieren +if [ $NEW -ne 0 ]; then + cp $LOST_GRUB_STAGESDIR/stage? $MOUNT/boot/grub/ +fi + +# Partition unmounten und loopback-Device freigeben +$SUDO umount $MOUNT +rmdir $MOUNT + + +# Grub installieren +if [ $NEW -ne 0 ]; then + $LOST_TOOLS_GRUB --no-floppy --batch > /dev/null <> $MOUNT/boot/grub/grub.cfg +if [ -e $MOUNT/boot/tyndur2 ]; then + cat build/config/grub_hd_kernel2.cfg >> $MOUNT/boot/grub/grub.cfg +fi +if [ -e $MOUNT/boot/tyndur ]; then + cat build/config/grub_hd.cfg >> $MOUNT/boot/grub/grub.cfg +fi + +convert_menu_lst $MOUNT/boot/grub/grub.cfg + +# Grub kopieren +if [ $NEW -ne 0 ]; then + xargs -isrc cp src $MOUNT/boot/grub <<-EOF + $LOST_GRUB2_MODULESDIR/boot.mod + $LOST_GRUB2_MODULESDIR/cat.mod + $LOST_GRUB2_MODULESDIR/configfile.mod + $LOST_GRUB2_MODULESDIR/crypto.mod + $LOST_GRUB2_MODULESDIR/extcmd.mod + $LOST_GRUB2_MODULESDIR/gzio.mod + $LOST_GRUB2_MODULESDIR/ls.mod + $LOST_GRUB2_MODULESDIR/mmap.mod + $LOST_GRUB2_MODULESDIR/multiboot.mod + $LOST_GRUB2_MODULESDIR/normal.mod + $LOST_GRUB2_MODULESDIR/relocator.mod + $LOST_GRUB2_MODULESDIR/terminal.mod + $LOST_GRUB2_MODULESDIR/video.mod +EOF +fi + +# Partition unmounten und loopback-Device freigeben +$SUDO umount $MOUNT +rmdir $MOUNT + + +# Grub installieren +if [ $NEW -ne 0 ]; then + LOOP_DEV=`$SUDO losetup -f $IMAGE_PATH --show` + if [ $? -ne 0 ]; then + die "Loop Device konnte nicht angelegt werden" + fi + + mkdir -p build/grub2 + echo "(img) $LOOP_DEV" > build/grub2/device.map + + cp $LOST_GRUB2_MODULESDIR/boot.img build/grub2/ + grub-mkimage -O i386-pc -o build/grub2/core.img ext2 biosdisk part_msdos minicmd + + $SUDO grub-setup -m build/grub2/device.map -d build/grub2 -r "(img,1)" "(img)" + + $SUDO losetup -d $LOOP_DEV +fi diff --git a/buildmk.sh b/buildmk.sh index c8950d3..8f390e4 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -87,6 +87,13 @@ BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output PPC_BINARY=$LOST_TOOLS_PPC EOF +# Ist grub legacy installiert? +if [ -f $GRUB_STAGEDIR/stage1 ]; then + echo GRUB_VERSION=grub1 >> Makefile.local +else + echo GRUB_VERSION=grub2 >> Makefile.local +fi + cat < Makefile -include Makefile.local @@ -274,26 +281,23 @@ updateroot: subdirs build/scripts/updateroot image-floppy: updateroot - build/scripts/image_floppy + build/scripts/image_floppy_\$(GRUB_VERSION) image-hd: updateroot - build/scripts/image_hd + build/scripts/image_hd_\$(GRUB_VERSION) image-cdrom: updateroot - build/scripts/image_cdrom + build/scripts/image_cdrom_\$(GRUB_VERSION) -grub2-hd: updateroot - build/scripts/grub2_hd - -grub2-cdrom: updateroot - build/scripts/grub2_cdrom - -test-qemu: image-floppy +test-qemu-floppy: image-floppy $LOST_TOOLS_QEMU -serial stdio -fda build/images/floppy.img -boot a -net user -net nic,model=rtl8139 | tee qemu-serial.log test-qemu-hd: image-hd $LOST_TOOLS_QEMU -serial stdio -hda build/images/hd.img -net user -net nic,model=rtl8139 | tee qemu-serial.log +test-qemu-cdrom: image-cdrom + $LOST_TOOLS_QEMU -serial stdio -cdrom build/images/cdrom.img -boot d -net user -net nic,model=rtl8139 | tee qemu-serial.log + test-bochs: image-floppy bochs -f bochs.config -- 1.7.1 From hartmut at tyndur.org Fri Jan 7 11:53:25 2011 From: hartmut at tyndur.org (Alexander Hartmut Kluth) Date: Fri, 7 Jan 2011 02:53:25 -0800 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH=5D_grub2=5Fhd_-_--directory=3D?= =?utf-8?q?=24LOST=5FGRUB2=5FMODULESDIR_hinzugef=C3=BCgt?= Message-ID: <1294397605-6831-1-git-send-email-hartmut@tyndur.org> From: Alexander Hartmut Kluth + Wenn das Image via grub-mkimage gebaut wird und jemand in der config.sh einen anderen Pfad unter $LOST_GRUB2_MODULESDIR eingetragen hat so sucht grub-mkimage per --directory=$LOST_GRUB2_MODULESDIR nach den Dateien und nicht im Standard- verzeichnis (/usr/lib/grub/$platform) Signed-off-by: Alexander Hartmut Kluth --- build/scripts/grub2_hd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build/scripts/grub2_hd b/build/scripts/grub2_hd index 9c0f5a8..d7ff5bb 100755 --- a/build/scripts/grub2_hd +++ b/build/scripts/grub2_hd @@ -146,7 +146,7 @@ if [ $NEW -ne 0 ]; then echo "(img) $LOOP_DEV" > build/grub2/device.map cp $LOST_GRUB2_MODULESDIR/boot.img build/grub2/ - grub-mkimage -O i386-pc -o build/grub2/core.img ext2 biosdisk part_msdos minicmd + grub-mkimage --directory=$LOST_GRUB2_MODULESDIR -O i386-pc -o build/grub2/core.img ext2 biosdisk part_msdos minicmd $SUDO grub-setup -m build/grub2/device.map -d build/grub2 -r "(img,1)" "(img)" -- 1.7.1 From kevin at tyndur.org Fri Jan 7 16:56:51 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Fri, 7 Jan 2011 16:56:51 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH=5D_image=5Fhd=3A_Vor_umount_Ben?= =?utf-8?q?utzer_des_Mountpoint_abschie=C3=9Fen?= In-Reply-To: References: Message-ID: <1294415811-7576-1-git-send-email-kevin@tyndur.org> ! image_hd: Es kann passieren, dass ein Desktop-Daemon noch eine Datei unter dem Mountpoint in Beschlag hat, so dass nicht ungemountet werden kann. Diese Prozesse killen sollte das Problem lösen. Signed-off-by: Kevin Wolf --- build/scripts/image_hd_grub1 | 1 + build/scripts/image_hd_grub2 | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/build/scripts/image_hd_grub1 b/build/scripts/image_hd_grub1 index 70ce748..402f68e 100755 --- a/build/scripts/image_hd_grub1 +++ b/build/scripts/image_hd_grub1 @@ -106,6 +106,7 @@ if [ $NEW -ne 0 ]; then fi # Partition unmounten und loopback-Device freigeben +fuser -km $MOUNT $SUDO umount $MOUNT rmdir $MOUNT diff --git a/build/scripts/image_hd_grub2 b/build/scripts/image_hd_grub2 index d7ff5bb..a49c3fc 100755 --- a/build/scripts/image_hd_grub2 +++ b/build/scripts/image_hd_grub2 @@ -131,6 +131,7 @@ EOF fi # Partition unmounten und loopback-Device freigeben +fuser -km $MOUNT $SUDO umount $MOUNT rmdir $MOUNT -- 1.6.0.2 From alex at tyndur.org Fri Jan 7 17:00:02 2011 From: alex at tyndur.org (Alexander Siol) Date: Fri, 07 Jan 2011 17:00:02 +0100 Subject: [tyndur-devel] [PATCH] libc: ctype.h standardkonformer In-Reply-To: <1294330944-30278-1-git-send-email-kevin@tyndur.org> References: <1294330944-30278-1-git-send-email-kevin@tyndur.org> Message-ID: <4D273882.9000004@tyndur.org> Am 06.01.2011 17:22, schrieb Kevin Wolf: > ! libc: Funktionen nur als static inline im Header anbieten ist nicht > erlaubt, man muss auch dagegen linken können > > Signed-off-by: Kevin Wolf Acked-by: Alexander Siol From Christian.Klahn at Live.de Fri Jan 7 17:29:50 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Fri, 7 Jan 2011 17:29:50 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH=5D_image=5Fhd=3A_Vor_umoun?= =?iso-8859-1?q?t_Benutzer_des_Mountpoint_abschie=DFen?= In-Reply-To: <1294415811-7576-1-git-send-email-kevin@tyndur.org> References: <1294415811-7576-1-git-send-email-kevin@tyndur.org> Message-ID: Am 07.01.2011 16:56, schrieb Kevin Wolf: > ! image_hd: Es kann passieren, dass ein Desktop-Daemon noch eine Datei > unter dem Mountpoint in Beschlag hat, so dass nicht ungemountet werden > kann. Diese Prozesse killen sollte das Problem lösen. > > Signed-off-by: Kevin Wolf > --- > build/scripts/image_hd_grub1 | 1 + > build/scripts/image_hd_grub2 | 1 + > 2 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/build/scripts/image_hd_grub1 b/build/scripts/image_hd_grub1 > index 70ce748..402f68e 100755 > --- a/build/scripts/image_hd_grub1 > +++ b/build/scripts/image_hd_grub1 > @@ -106,6 +106,7 @@ if [ $NEW -ne 0 ]; then > fi > > # Partition unmounten und loopback-Device freigeben > +fuser -km $MOUNT > $SUDO umount $MOUNT > rmdir $MOUNT > > diff --git a/build/scripts/image_hd_grub2 b/build/scripts/image_hd_grub2 > index d7ff5bb..a49c3fc 100755 > --- a/build/scripts/image_hd_grub2 > +++ b/build/scripts/image_hd_grub2 > @@ -131,6 +131,7 @@ EOF > fi > > # Partition unmounten und loopback-Device freigeben > +fuser -km $MOUNT > $SUDO umount $MOUNT > rmdir $MOUNT > Acked-by: Christian Klahn From m.nemo at gmx.net Fri Jan 7 23:11:12 2011 From: m.nemo at gmx.net (MNemo) Date: Fri, 07 Jan 2011 23:11:12 +0100 Subject: [tyndur-devel] build: ein Makefile.local reicht Message-ID: <4D278F80.9090401@gmx.net> * buildmk.sh generiert nur noch ein Makefile.local für alle Makefiles Signed-off-by: Andreas Freimuth diff --git a/buildmk.sh b/buildmk.sh --- a/buildmk.sh +++ b/buildmk.sh @@ -82,20 +82,22 @@ if [ -f Makefile.conf ]; then source Makefile.conf fi -cat < Makefile.local +if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then + cat < Makefile.local BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output PPC_BINARY=$LOST_TOOLS_PPC EOF -# Ist grub legacy installiert? -if [ -f $GRUB_STAGEDIR/stage1 ]; then - echo GRUB_VERSION=grub1 >> Makefile.local -else - echo GRUB_VERSION=grub2 >> Makefile.local + # Ist grub legacy installiert? + if [ -f $GRUB_STAGEDIR/stage1 ]; then + echo GRUB_VERSION=grub1 >> Makefile.local + else + echo GRUB_VERSION=grub2 >> Makefile.local + fi fi cat < Makefile --include Makefile.local +-include $LOST_BUILDMK_ROOT/Makefile.local CC=$LOST_TOOLS_GCC $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND CPP=$LOST_TOOLS_GPP $INCLUDES From kevin at tyndur.org Fri Jan 7 23:19:35 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Fri, 7 Jan 2011 23:19:35 +0100 Subject: [tyndur-devel] [PATCH] Makefile: cscope-Target Message-ID: <1294438775-11751-1-git-send-email-kevin@tyndur.org> + make cscope generiert eine cscope-Datenbank für alle C-Dateien im ganzen Verzeichnisbaum Signed-off-by: Kevin Wolf --- Makefile | 5 +++++ buildmk.sh | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 844814c..cb5c7ca 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,11 @@ test-qemu-cdrom: image-cdrom test-bochs: image-floppy bochs -f bochs.config +cscope: + rm -f cscope.* + find /home/kevin/entwicklung/tyndur/src -name '*.[ch]' > cscope.files + cscope -bk + menuconfig: python config.py diff --git a/buildmk.sh b/buildmk.sh index 800ac2a..b5497b9 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -301,6 +301,11 @@ test-qemu-cdrom: image-cdrom test-bochs: image-floppy bochs -f bochs.config +cscope: + rm -f cscope.* + find `pwd`/src -name '*.[ch]' > cscope.files + cscope -bk + menuconfig: python config.py -- 1.6.0.2 From kevin at tyndur.org Sat Jan 8 11:59:47 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 8 Jan 2011 11:59:47 +0100 Subject: [tyndur-devel] [PATCH v2] Makefile: cscope-Target In-Reply-To: <1294438775-11751-1-git-send-email-kevin@tyndur.org> References: <1294438775-11751-1-git-send-email-kevin@tyndur.org> Message-ID: <1294484387-12997-1-git-send-email-kevin@tyndur.org> + make cscope generiert eine cscope-Datenbank für alle C-Dateien im ganzen Verzeichnisbaum Signed-off-by: Kevin Wolf --- Makefile | 5 +++++ buildmk.sh | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 844814c..1ad911c 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,11 @@ test-qemu-cdrom: image-cdrom test-bochs: image-floppy bochs -f bochs.config +cscope: + rm -f cscope.* + find `pwd`/src -name '*.[ch]' > cscope.files + cscope -bk + menuconfig: python config.py diff --git a/buildmk.sh b/buildmk.sh index 800ac2a..6992081 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -301,6 +301,11 @@ test-qemu-cdrom: image-cdrom test-bochs: image-floppy bochs -f bochs.config +cscope: + rm -f cscope.* + find \`pwd\`/src -name '*.[ch]' > cscope.files + cscope -bk + menuconfig: python config.py -- 1.6.0.2 From kevin at tyndur.org Sat Jan 8 12:08:46 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 8 Jan 2011 12:08:46 +0100 Subject: [tyndur-devel] build: ein Makefile.local reicht In-Reply-To: <4D278F80.9090401@gmx.net> References: <4D278F80.9090401@gmx.net> Message-ID: <20110108110829.GA5100@silvanus> On Fri, Jan 07, 2011 at 11:11:12PM +0100, MNemo wrote: > * buildmk.sh generiert nur noch ein Makefile.local für alle Makefiles > > Signed-off-by: Andreas Freimuth Erstmal was allgemeines: Kannst du deine git-Konfiguration so ändern, dass als Autor Andreas Freimuth statt MNemo benutzt wird? > > diff --git a/buildmk.sh b/buildmk.sh > --- a/buildmk.sh > +++ b/buildmk.sh > @@ -82,20 +82,22 @@ if [ -f Makefile.conf ]; then > source Makefile.conf > fi > > -cat < Makefile.local > +if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then > + cat < Makefile.local > BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output > PPC_BINARY=$LOST_TOOLS_PPC > EOF > > -# Ist grub legacy installiert? > -if [ -f $GRUB_STAGEDIR/stage1 ]; then > - echo GRUB_VERSION=grub1 >> Makefile.local > -else > - echo GRUB_VERSION=grub2 >> Makefile.local > + # Ist grub legacy installiert? > + if [ -f $GRUB_STAGEDIR/stage1 ]; then > + echo GRUB_VERSION=grub1 >> Makefile.local > + else > + echo GRUB_VERSION=grub2 >> Makefile.local > + fi > fi > > cat < Makefile > --include Makefile.local > +-include $LOST_BUILDMK_ROOT/Makefile.local Das Problem hier (ist mir gestern leider nicht aufgefallen) ist, dass $LOST_BUILDMK_ROOT zur Laufzeit von buildmk.sh ausgewertet wird. Und damit haben wir wieder automatisch generierte lokale Änderungen in Makefile, was ja durch die Einführung von Makefile.local gerade verhindert werden sollte. Eventuell können wir mit relativen Pfaden was machen? Kevin From bluecoder at gmx.de Sat Jan 8 13:16:17 2011 From: bluecoder at gmx.de (=?iso-8859-1?q?J=F6rg_Pf=E4hler?=) Date: Sat, 8 Jan 2011 13:16:17 +0100 Subject: [tyndur-devel] build: ein Makefile.local reicht In-Reply-To: <20110108110829.GA5100@silvanus> References: <4D278F80.9090401@gmx.net> <20110108110829.GA5100@silvanus> Message-ID: <201101081316.18335.bluecoder@gmx.de> > Das Problem hier (ist mir gestern leider nicht aufgefallen) ist, dass > $LOST_BUILDMK_ROOT zur Laufzeit von buildmk.sh ausgewertet wird. Und > damit haben wir wieder automatisch generierte lokale Änderungen in > Makefile, was ja durch die Einführung von Makefile.local gerade > verhindert werden sollte. > > Eventuell können wir mit relativen Pfaden was machen? och, ein weiteres if tuts auch, siehe Anhang -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : 0001-nur-eine-Makefile.local-erzeugen.patch Dateityp : text/x-patch Dateigröße : 2603 bytes Beschreibung: nicht verfügbar URL : From m.nemo at gmx.net Sat Jan 8 14:48:19 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 08 Jan 2011 14:48:19 +0100 Subject: [tyndur-devel] Makefile Patches Message-ID: <4D286B23.6060703@gmx.net> Ein eingebundener Text mit undefiniertem Zeichensatz wurde abgetrennt. Name: patch1.diff URL: -------------- nächster Teil -------------- Ein eingebundener Text mit undefiniertem Zeichensatz wurde abgetrennt. Name: patch2.diff URL: From toni at tyndur.org Sat Jan 8 14:57:42 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 8 Jan 2011 14:57:42 +0100 Subject: [tyndur-devel] [PATCH] Makefile: cscope-Target In-Reply-To: <1294438775-11751-1-git-send-email-kevin@tyndur.org> References: <1294438775-11751-1-git-send-email-kevin@tyndur.org> Message-ID: <20110108135742.GA7079@neo.geekcave.lan> On Fri, Jan 07 23:19, Kevin Wolf wrote: > + make cscope generiert eine cscope-Datenbank für alle C-Dateien im > ganzen Verzeichnisbaum > > Signed-off-by: Kevin Wolf > --- > Makefile | 5 +++++ > buildmk.sh | 5 +++++ > 2 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/Makefile b/Makefile > index 844814c..cb5c7ca 100644 > --- a/Makefile > +++ b/Makefile > @@ -81,6 +81,11 @@ test-qemu-cdrom: image-cdrom > test-bochs: image-floppy > bochs -f bochs.config > > +cscope: > + rm -f cscope.* > + find /home/kevin/entwicklung/tyndur/src -name '*.[ch]' > cscope.files Ich bin relativ sicher dass das bei mir ein "No such file or directory" ausspuckt. ;-) > + cscope -bk > + > menuconfig: > python config.py > > diff --git a/buildmk.sh b/buildmk.sh > index 800ac2a..b5497b9 100644 > --- a/buildmk.sh > +++ b/buildmk.sh > @@ -301,6 +301,11 @@ test-qemu-cdrom: image-cdrom > test-bochs: image-floppy > bochs -f bochs.config > > +cscope: > + rm -f cscope.* > + find `pwd`/src -name '*.[ch]' > cscope.files > + cscope -bk > + > menuconfig: > python config.py -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From m.nemo at gmx.net Sat Jan 8 15:01:39 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 08 Jan 2011 15:01:39 +0100 Subject: [tyndur-devel] Makefile Patches In-Reply-To: <4D286B23.6060703@gmx.net> References: <4D286B23.6060703@gmx.net> Message-ID: <4D286E43.7020200@gmx.net> Version 2 von Patch 2 jetzt weiß ich auch wieder wieso mir rm `basename \`pwd\`` aufgefallen ist *g* -------------- nächster Teil -------------- Ein eingebundener Text mit undefiniertem Zeichensatz wurde abgetrennt. Name: patch2v2.diff URL: From toni at tyndur.org Sat Jan 8 15:08:12 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 8 Jan 2011 15:08:12 +0100 Subject: [tyndur-devel] [PATCH 1/7] init: init.h benutzen statt lokal deklarieren In-Reply-To: <1293628353-11131-2-git-send-email-kevin@tyndur.org> References: <1293628353-11131-1-git-send-email-kevin@tyndur.org> <1293628353-11131-2-git-send-email-kevin@tyndur.org> Message-ID: <20110108140811.GB7079@neo.geekcave.lan> On Wed, Dec 29 14:12, Kevin Wolf wrote: > * init: Wer Datenstrukturen einer Headerdatei benutzt, sollte diese > Headerdatei auch einbinden anstatt Code zu duplizieren. > > Signed-off-by: Kevin Wolf Acked-by: Antoine Kaufmann -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From toni at tyndur.org Sat Jan 8 15:10:59 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 8 Jan 2011 15:10:59 +0100 Subject: [tyndur-devel] [PATCH 2/7] libc: cmdline_get_argc/copy_argv In-Reply-To: <1293628353-11131-3-git-send-email-kevin@tyndur.org> References: <1293628353-11131-1-git-send-email-kevin@tyndur.org> <1293628353-11131-3-git-send-email-kevin@tyndur.org> Message-ID: <20110108141059.GC7079@neo.geekcave.lan> On Wed, Dec 29 14:12, Kevin Wolf wrote: > + libc: Neue Funktionen cmdline_get_argc und cmdline_copy_argv, die aus > einer gegebenen Kommandozeile argc auslesen bzw. ein gegebenes argv > aus der Kommandozeile befuellen > * libc: crt0.c benutzt die neuen Funktionen statt der eigenen > Implementierung > > Signed-off-by: Kevin Wolf > --- > src/modules/include/init.h | 2 ++ > src/modules/lib/crt0.c | 42 ++++++++++-------------------------------- > src/modules/lib/init.c | 38 ++++++++++++++++++++++++++++++++++++++ > 3 files changed, 50 insertions(+), 32 deletions(-) > > diff --git a/src/modules/include/init.h b/src/modules/include/init.h > index 195511a..d431cee 100644 > --- a/src/modules/include/init.h > +++ b/src/modules/include/init.h > @@ -43,6 +43,8 @@ char *init_service_get_name(pid_t pid); > void init_process_exit(int result); > pid_t init_execute(const char* cmd); > > +int cmdline_get_argc(const char* args); > +void cmdline_copy_argv(char* args, const char** argv, size_t argc); > > > > diff --git a/src/modules/lib/crt0.c b/src/modules/lib/crt0.c > index 4c3192d..fb42271 100644 > --- a/src/modules/lib/crt0.c > +++ b/src/modules/lib/crt0.c > @@ -27,8 +27,9 @@ > */ > > #include > -#include "syscall.h" > -#include "rpc.h" > +#include > +#include > +#include > #include > #include > > @@ -56,7 +57,9 @@ static void call_constructors(void) > > void __attribute__((weak)) _start(void) > { > - //v(); > + char* args = NULL; > + int argc; > + > init_memory_manager(); > init_messaging(); > init_sync_messages(); > @@ -70,37 +73,12 @@ void __attribute__((weak)) _start(void) > //Kommandozeilenargumente Parsen ---- > //TODO: Das ist alles noch sehr primitiv > //Erst den String vom Kernel holen > - char* args = get_cmdline(); > - int argc, pos, f; > - argc = 0; > - f = 0; > - //Jetzt werden die Argumente gezaehlt. > - for (pos = 0; pos < strlen(args); pos++) { > - if (args[pos] == ' ') { > - // mehrere leerzeichen direkt hintereinander nur einmal z???hlen > - if(f == 1) > - { > - argc++; > - } > - f = 0; > - } > - else > - { > - f = 1; > - } > - } > - if(f == 1) > - { > - argc++; > - } > + args = get_cmdline(); > + argc = cmdline_get_argc(args); > > char* argv[argc + 1]; > - argv[0] = strtok(args, " "); > - for(pos = 1; pos < argc; pos++) > - { > - argv[pos] = strtok(NULL, " "); > - } > - argv[argc] = NULL; > + > + cmdline_copy_argv(args, (const char**) argv, argc); > > call_constructors(); > int result = main(argc, argv); > diff --git a/src/modules/lib/init.c b/src/modules/lib/init.c > index 3e021c8..ea0a7d2 100644 > --- a/src/modules/lib/init.c > +++ b/src/modules/lib/init.c > @@ -35,6 +35,7 @@ > #include "stdlib.h" > #include > #include > +#include > #include > > // Kindprozess eintragen > @@ -177,6 +178,43 @@ pid_t init_execute(const char* cmd) > return pid; > } > > +/* > + * Zaehlt die Argumente in einer Kommandozeile. Mehrere aufeinanderfolgende > + * Leerzeichen werden als ein einziger Trenner aufgefasst. > + */ > +int cmdline_get_argc(const char* args) > +{ > + bool space = false; > + int argc = 0; > + int pos; > + > + for (pos = 0; pos < strlen(args); pos++) { > + if (isspace(args[pos]) && !space) { > + argc++; > + } > + > + space = isspace(args[pos]); > + } > + > + if (!space) { > + argc++; > + } > + > + return argc; > +} > + Vielleicht sollte man hier in einem Kommentar noch anmerken dass args veraendert wird, und auch nicht freigegeben werden darf. > +void cmdline_copy_argv(char* args, const char** argv, size_t argc) > +{ > + int pos; > + argv[0] = strtok(args, " "); > + > + for(pos = 1; pos < argc; pos++) { > + argv[pos] = strtok(NULL, " "); > + } > + > + argv[argc] = NULL; > +} > + > int init_dev_register(struct init_dev_desc* dev, size_t size) > { > return rpc_get_int(1, "DEV_REG ", size, (char*) dev); Sonst sieht das gut aus, glaube ich. ;-) Acked-by: Antoine Kaufmann -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From toni at tyndur.org Sat Jan 8 15:11:59 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 8 Jan 2011 15:11:59 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_3/7=5D_kernel2=3A_Fixes_f?= =?iso-8859-1?q?=FCr_SHM_in_nicht-aktivem_Kontext?= In-Reply-To: <1293628353-11131-4-git-send-email-kevin@tyndur.org> References: <1293628353-11131-1-git-send-email-kevin@tyndur.org> <1293628353-11131-4-git-send-email-kevin@tyndur.org> Message-ID: <20110108141158.GD7079@neo.geekcave.lan> On Wed, Dec 29 14:12, Kevin Wolf wrote: > ! kernel2: Die SHM-Funktionen müssen auf dem Speicherkontext des > übergebenen Prozesses arbeiten, nicht auf dem aktiven > > Signed-off-by: Kevin Wolf Sieht sinnvoll aus. Wobei ich jetzt nicht geprueft habe ob du alle Vorkommen erwischt hast. Acked-by: Antoine Kaufmann -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From toni at tyndur.org Sat Jan 8 15:25:33 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 8 Jan 2011 15:25:33 +0100 Subject: [tyndur-devel] [PATCH 4/7] kernel2: SYSCALL_PM_INIT_PROC_PARAM_BLOCK In-Reply-To: <1293628353-11131-5-git-send-email-kevin@tyndur.org> References: <1293628353-11131-1-git-send-email-kevin@tyndur.org> <1293628353-11131-5-git-send-email-kevin@tyndur.org> Message-ID: <20110108142533.GE7079@neo.geekcave.lan> On Wed, Dec 29 14:12, Kevin Wolf wrote: > + kernel2: Syscall, um einem neuen Kindprozess einen > Prozessparameterblock zu uebergeben. Dazu wird Shared Memory in den > Kindprozess gemappt und Pointer, Größe und SHM-ID in Registern > übergeben. > > Signed-off-by: Kevin Wolf Acked-by: Antoine Kaufmann -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From m.nemo at gmx.net Sat Jan 8 17:12:43 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 8 Jan 2011 17:12:43 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/2=5D_Makefile=3A_lbuilds-env_?= =?utf-8?q?und_*-pascal_targets_nur_im_Hauptmakefile?= In-Reply-To: <1294503163-16562-1-git-send-email-m.nemo@gmx.net> References: <1294503163-16562-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294503163-16562-2-git-send-email-m.nemo@gmx.net> * lbuilds-env, enable- und disable-pascal Targets werden in den Untermakefiles nicht gebraucht Signed-off-by: Andreas Freimuth --- Makefile | 23 ++++++++++++----------- buildmk.sh | 33 +++++++++++++++------------------ 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 844814c..3b1972a 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,20 @@ subdirs: $(MAKE) --no-print-directory -sC doc $(MAKE) --no-print-directory -sC src +clean_objs: + rm -f *.o *.a *.mod *.ppu link.res ppas.sh tyndur + +softclean: clean_objs + for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" softclean; fi done + +clean: clean_objs + for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done + rm -f Makefile.local + +.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd .PHONY: lbuilds-env +# Code für lbuilds lbuilds-env: if [ -d lbuilds ]; then cd lbuilds && git pull; else git clone git://git.tyndur.org/lbuilds.git lbuilds; fi touch lbuilds/.nobuild @@ -39,17 +51,6 @@ enable-pascal: disable-pascal: rm -f src/modules/pas/.ignorenobuild -clean_objs: - rm -f *.o *.a *.mod *.ppu link.res ppas.sh tyndur - -softclean: clean_objs - for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" softclean; fi done - -clean: clean_objs - for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done - rm -f Makefile.local - -.SILENT: all makefiles subdirs obj lbuilds-env enable-pascal disable-pascal clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd clean: clean_root clean_root: diff --git a/buildmk.sh b/buildmk.sh index fc030ce..1250301 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -243,24 +243,6 @@ for file in *.c *.cpp *.asm *.pas *.S; do fi done -# Code für lbuilds -cat <> Makefile - -.PHONY: lbuilds-env - -lbuilds-env: - if [ -d lbuilds ]; then cd lbuilds && git pull; else git clone git://git.tyndur.org/lbuilds.git lbuilds; fi - touch lbuilds/.nobuild - cd lbuilds && scripts/build_crosstools && scripts/update_env \`dirname \\\`pwd\\\`\` && ln -sf \`pwd\`/tmp/cross-fpc/fpc-2.4.0/rtl/ \`dirname \\\`pwd\\\`\`/src/modules/pas/lib/rtl/include - make enable-pascal - -enable-pascal: - touch src/modules/pas/.ignorenobuild - -disable-pascal: - rm -f src/modules/pas/.ignorenobuild -EOF - # Code für make clean cat <> Makefile @@ -279,6 +261,21 @@ EOF if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then cat <> Makefile +.PHONY: lbuilds-env + +# Code für lbuilds +lbuilds-env: + if [ -d lbuilds ]; then cd lbuilds && git pull; else git clone git://git.tyndur.org/lbuilds.git lbuilds; fi + touch lbuilds/.nobuild + cd lbuilds && scripts/build_crosstools && scripts/update_env \`dirname \\\`pwd\\\`\` && ln -sf \`pwd\`/tmp/cross-fpc/fpc-2.4.0/rtl/ \`dirname \\\`pwd\\\`\`/src/modules/pas/lib/rtl/include + make enable-pascal + +enable-pascal: + touch src/modules/pas/.ignorenobuild + +disable-pascal: + rm -f src/modules/pas/.ignorenobuild + clean: clean_root clean_root: -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 8 17:12:42 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 8 Jan 2011 17:12:42 +0100 Subject: [tyndur-devel] [PATCH 1/2] build: ein Makefile.local reicht Message-ID: <1294503163-16562-1-git-send-email-m.nemo@gmx.net> * buildmk.sh generiert nur noch ein Makefile.local für alle Makefiles Signed-off-by: Andreas Freimuth Signed-off-by: Jörg Pfähler --- buildmk.sh | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/buildmk.sh b/buildmk.sh index 800ac2a..fc030ce 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -82,20 +82,29 @@ if [ -f Makefile.conf ]; then source Makefile.conf fi -cat < Makefile.local +if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then + cat < Makefile.local BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output PPC_BINARY=$LOST_TOOLS_PPC EOF -# Ist grub legacy installiert? -if [ -f $GRUB_STAGEDIR/stage1 ]; then - echo GRUB_VERSION=grub1 >> Makefile.local + # Ist grub legacy installiert? + if [ -f $GRUB_STAGEDIR/stage1 ]; then + echo GRUB_VERSION=grub1 >> Makefile.local + else + echo GRUB_VERSION=grub2 >> Makefile.local + fi +fi + +# Nur die Unterverzeichnisse nutzen den absoluten Pfad zu Makefile.local, um +# Änderungen am Makefile im Wurzelverzeichnis zu verhindern +if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then + echo "-include Makefile.local" > Makefile else - echo GRUB_VERSION=grub2 >> Makefile.local + echo "-include $LOST_BUILDMK_ROOT/Makefile.local" > Makefile fi -cat < Makefile --include Makefile.local +cat <> Makefile CC=$LOST_TOOLS_GCC $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND CPP=$LOST_TOOLS_GPP $INCLUDES @@ -136,13 +145,13 @@ makefiles: EOF -# Wenn eine .nobuildfiles mit eintraegen fuer alle Dateien die nicht gebaut +# Wenn eine .nobuildfiles mit eintraegen für alle Dateien die nicht gebaut # werden sollen exisitiert, wird diese eingelesen NOBUILDFILES= if [ -f .nobuildfiles ]; then NOBUILDFILES="`cat .nobuildfiles`"; fi # Dateien zusammensuchen,die im aktuellen Verzeichnis -# kompiliert werden müssen +# kompiliert werden müssen FILES= for file in *.c *.cpp *.asm *.pas *.S; do if [ "`echo \"$NOBUILDFILES\" | grep -e ^$file\$`" ]; then continue; fi @@ -234,7 +243,7 @@ for file in *.c *.cpp *.asm *.pas *.S; do fi done -# Code für lbuilds +# Code für lbuilds cat <> Makefile .PHONY: lbuilds-env @@ -252,7 +261,7 @@ disable-pascal: rm -f src/modules/pas/.ignorenobuild EOF -# Code für make clean +# Code für make clean cat <> Makefile clean_objs: -- 1.7.3.4 From toni at tyndur.org Sat Jan 8 17:15:52 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 8 Jan 2011 17:15:52 +0100 Subject: [tyndur-devel] [PATCH 5/7] libc: Erstellen und Auslesen von PPBs In-Reply-To: <1293628353-11131-6-git-send-email-kevin@tyndur.org> References: <1293628353-11131-1-git-send-email-kevin@tyndur.org> <1293628353-11131-6-git-send-email-kevin@tyndur.org> Message-ID: <20110108161551.GF7079@neo.geekcave.lan> On Wed, Dec 29 14:12, Kevin Wolf wrote: > + libc: Funktionen zum Erstellen und zum anschließend Auslesen eines > Prozessparameterblocks > > Signed-off-by: Kevin Wolf > --- > src/modules/include/init.h | 7 + > src/modules/lib/param.c | 264 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 271 insertions(+), 0 deletions(-) > create mode 100644 src/modules/lib/param.c > > diff --git a/src/modules/include/init.h b/src/modules/include/init.h > index d431cee..eb29b3a 100644 > --- a/src/modules/include/init.h > +++ b/src/modules/include/init.h > @@ -30,11 +30,13 @@ > > #include > #include > +#include > > #define INIT_PID 1 > > extern void stdio_init(void); > > +struct proc_param_block; > > void init_service_register(char* name); > pid_t init_service_get(char* name); > @@ -42,10 +44,15 @@ char *init_service_get_name(pid_t pid); > > void init_process_exit(int result); > pid_t init_execute(const char* cmd); > +int ppb_from_argv(const char* const argv[]); > > int cmdline_get_argc(const char* args); > void cmdline_copy_argv(char* args, const char** argv, size_t argc); > > +bool ppb_is_valid(struct proc_param_block* ppb, size_t ppb_size); > +int ppb_get_argc(struct proc_param_block* ppb, size_t ppb_size); > +void ppb_copy_argv(struct proc_param_block* ppb, size_t ppb_size, > + char** argv, int argc); > > > #ifdef _USE_START_ > diff --git a/src/modules/lib/param.c b/src/modules/lib/param.c > new file mode 100644 > index 0000000..c3a4f60 > --- /dev/null > +++ b/src/modules/lib/param.c > @@ -0,0 +1,264 @@ > +/* > + * Copyright (c) 2010 The tyndur Project. All rights reserved. > + * > + * This code is derived from software contributed to the tyndur Project > + * by Kevin Wolf. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED > + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR > + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; > + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, > + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR > + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF > + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +#include > +#include > +#include > + > +#include > +#include > + > +enum ppb_entry_type { > + PPB_CMDLINE_ARG = 1, > + PPB_ENV_VAR, > +}; > + > +struct ppb_entry { > + enum ppb_entry_type type; > + ptrdiff_t value; > + size_t len; > +}; > + > +struct proc_param_block { > + size_t num; > + struct ppb_entry entries[]; > +}; > + > +struct ppb_builder { > + struct proc_param_block* ppb; > + size_t ppb_dir_size; > + size_t ppb_dir_used; > + size_t ppb_data_used; > +}; > + > +extern pid_t __init_exec(const char* cmd, int ppb_shm_id); Wofür ist denn das genau gut? > + > +static struct ppb_builder* ppb_builder_init(void) > +{ > + struct ppb_builder* b; > + > + b = malloc(sizeof(*b)); > + if (b == NULL) { > + return NULL; > + } > + Hm wozu brauchst du hier ueberhaupt ganze Pages? Wenn ich das richtig sehe, dann wird das ganze doch am Ende eh in einen SHM-Puffer kopiert und dann freigegeben? > + b->ppb = mem_allocate(PAGE_SIZE, 0); > + b->ppb_dir_size = PAGE_SIZE; > + b->ppb_dir_used = sizeof(struct proc_param_block); > + b->ppb_data_used = 0; > + > + memset(b->ppb, 0, PAGE_SIZE); > + > + return b; > +} > + > +static void* pgrealloc(void* old, size_t old_size, size_t new_size) > +{ > + void* new; > + > + new = mem_allocate(new_size, 0); > + if (new == NULL) { > + return NULL; > + } > + > + memcpy(new, old, old_size); > + mem_free(old, old_size); Hier eventuell noch ein memset(((char*) new) + old_size, 0, new_size - old_size), oder? > + > + return new; > +} > + > +static int ppb_add_entry(struct ppb_builder* b, enum ppb_entry_type type, > + const void* value, size_t len) > +{ > + size_t used; > + int index; > + void* new; > + > + /* Verzeichnis vergroessern falls noetig */ > + used = b->ppb_dir_used + sizeof(struct ppb_entry); > + > + if (used > b->ppb_dir_size) { > + new = pgrealloc(b->ppb, b->ppb_dir_size, NUM_PAGES(used)); > + if (new == NULL) { > + return -ENOMEM; > + } > + > + b->ppb = new; > + b->ppb_dir_size = NUM_PAGES(b->ppb_dir_used); > + } > + > + /* Daten eintragen */ > + index = b->ppb->num++; > + b->ppb->entries[index].type = type; > + b->ppb->entries[index].value = (ptrdiff_t) value; > + b->ppb->entries[index].len = len; > + > + b->ppb_dir_used += sizeof(struct ppb_entry); > + b->ppb_data_used += len; > + > + return 0; > +} > + > +static int ppb_builder_finish(struct ppb_builder* b) > +{ > + int shm; > + size_t size; > + uint8_t* p; > + int i, num_entries; > + ptrdiff_t offset; > + struct ppb_entry* entry; > + > + /* Shared Memory anlegen */ > + size = b->ppb_dir_used + b->ppb_data_used; > + > + shm = create_shared_memory(size); > + if (shm < 0) { > + return shm; > + } > + > + p = open_shared_memory(shm); > + if (p == NULL) { > + return -ENOMEM; > + } > + > + /* Daten kopieren*/ > + num_entries = b->ppb->num; > + offset = b->ppb_dir_used; > + > + for (i = 0; i < num_entries; i++) { > + entry = &b->ppb->entries[i]; > + memcpy(p + offset, (void*) entry->value, entry->len); > + entry->value = offset; > + offset += entry->len; > + } > + > + memcpy(p, b->ppb, b->ppb_dir_used); > + > + /* Strukturen freigeben */ > + mem_free(b->ppb, NUM_PAGES(b->ppb_dir_used)); > + free(b); > + > + return shm; > +} > + > +int ppb_from_argv(const char* const argv[]) > +{ > + struct ppb_builder* b; > + int shm; > + const char* const* p; > + > + b = ppb_builder_init(); > + if (b == NULL) { > + errno = ENOMEM; > + return -1; > + } > + > + p = argv; > + while (*p != NULL) { > + ppb_add_entry(b, PPB_CMDLINE_ARG, *p, strlen(*p) + 1); > + p++; > + } > + > + shm = ppb_builder_finish(b); > + if (shm < 0) { > + errno = -shm; > + return -1; > + } > + > + return shm; > +} > + > +bool ppb_is_valid(struct proc_param_block* ppb, size_t ppb_size) > +{ > + size_t offset; > + size_t len; > + int i; > + > + len = sizeof(*ppb) + ppb->num + sizeof(*ppb->entries); Ich glaube das sollte ein * sein: ^ > + if (ppb_size < len) { > + return false; > + } > + > + ppb_size -= len; > + for (i = 0; i < ppb->num; i++) { > + len = ppb->entries[i].len; > + if (ppb_size < len) { > + return false; > + } > + > + offset = ppb->entries[i].value; > + if (offset > ppb_size || offset + len > ppb_size) { Müsstest du hier nicht mit dem originalen ppb_size vergleichen? > + return false; > + } > + > + ppb_size -= len; > + } > + > + return true; > +} > + > +int ppb_get_argc(struct proc_param_block* ppb, size_t ppb_size) > +{ > + int i; > + int argc = 0; > + > + if (!ppb_is_valid(ppb, ppb_size)) { > + return -EINVAL; > + } > + > + for (i = 0; i < ppb->num; i++) { > + if (ppb->entries[i].type == PPB_CMDLINE_ARG) { > + argc++; > + } > + } > + > + return argc; > +} > + > +void ppb_copy_argv(struct proc_param_block* ppb, size_t ppb_size, > + char** argv, int argc) > +{ > + int i; > + int arg; > + > + if (!ppb_is_valid(ppb, ppb_size)) { > + return; > + } > + > + arg = 0; > + for (i = 0; i < ppb->num; i++) { > + if (ppb->entries[i].type == PPB_CMDLINE_ARG) { > + argv[arg++] = ((char*) ppb) + ppb->entries[i].value; > + if (arg == argc) { > + break; > + } > + } > + } > + > + argv[argc] = NULL; > +} Aber ich glaube von der Idee her finde ich das gut. -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From toni at tyndur.org Sat Jan 8 17:18:48 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 8 Jan 2011 17:18:48 +0100 Subject: [tyndur-devel] [PATCH 6/7] libc: crt0.c: argv aus PPB auslesen, falls vorhanden In-Reply-To: <1293628353-11131-7-git-send-email-kevin@tyndur.org> References: <1293628353-11131-1-git-send-email-kevin@tyndur.org> <1293628353-11131-7-git-send-email-kevin@tyndur.org> Message-ID: <20110108161847.GG7079@neo.geekcave.lan> On Wed, Dec 29 14:12, Kevin Wolf wrote: > + libc: Programme akzeptieren jetzt einen übergebenen PPB und lesen dann > ihre Argumente von dort aus. Die alte Methode ohne PPB bleibt > unterstützt, weil der Kernel keinen PPB für init bereitstellt. > > Signed-off-by: Kevin Wolf Acked-by: Antoine Kaufmann -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From bluecoder at gmx.de Sat Jan 8 17:56:54 2011 From: bluecoder at gmx.de (=?UTF-8?q?J=C3=B6rg=20Pf=C3=A4hler?=) Date: Sat, 8 Jan 2011 17:56:54 +0100 Subject: [tyndur-devel] [PATCH] =?UTF-8?q?*=20crosscompiler=20mit=20binutils=202.21=20und=20gcc=204.5.2 Message-ID: <1294505814-5349-1-git-send-email-bluecoder@gmx.de> --- patches/binutils/2.18/binutils-2.18.patch | 357 ---------------------- patches/binutils/2.18/oldbinutils.patch | 278 ----------------- patches/binutils/2.21/binutils-2.21.patch | 336 +++++++++++++++++++++ patches/gcc/4.2.2/gcc-4.2.2.patch | 454 ---------------------------- patches/gcc/4.5.2/gcc-4.5.2.patch | 463 +++++++++++++++++++++++++++++ scripts/build_crosstools | 112 ++++++-- 6 files changed, 890 insertions(+), 1110 deletions(-) delete mode 100644 patches/binutils/2.18/binutils-2.18.patch delete mode 100644 patches/binutils/2.18/oldbinutils.patch create mode 100644 patches/binutils/2.21/binutils-2.21.patch delete mode 100644 patches/gcc/4.2.2/gcc-4.2.2.patch create mode 100644 patches/gcc/4.5.2/gcc-4.5.2.patch diff --git a/patches/binutils/2.18/binutils-2.18.patch b/patches/binutils/2.18/binutils-2.18.patch deleted file mode 100644 index 24157bd..0000000 --- a/patches/binutils/2.18/binutils-2.18.patch +++ /dev/null @@ -1,357 +0,0 @@ -diff -uNr ../binutils-2.18/bfd/config.bfd ./bfd/config.bfd ---- ../binutils-2.18/bfd/config.bfd 2007-08-28 19:19:33.000000000 +0200 -+++ ./bfd/config.bfd 2008-01-21 15:22:03.000000000 +0100 -@@ -575,6 +575,11 @@ - targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec" - targ64_selvecs=bfd_elf64_x86_64_vec - ;; -+ i[3-7]86-*-tyndur) -+ targ_defvec=bfd_elf32_i386_vec -+ targ_selvecs=bfd_elf32_i386_vec -+ targ64_selvecs=bfd_elf64_x86_64_vec -+ ;; - #ifdef BFD64 - x86_64-*-elf*) - targ_defvec=bfd_elf64_x86_64_vec -diff -uNr ../binutils-2.18/config.sub ./config.sub ---- ../binutils-2.18/config.sub 2007-08-06 22:00:30.000000000 +0200 -+++ ./config.sub 2008-01-21 15:22:03.000000000 +0100 -@@ -121,8 +121,8 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -+ tyndur | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | \ -+ netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -1256,6 +1256,9 @@ - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -+ -tyndur*) -+ os=-tyndur -+ ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; -diff -uNr ../binutils-2.18/gas/configure.tgt ./gas/configure.tgt ---- ../binutils-2.18/gas/configure.tgt 2007-08-28 19:19:36.000000000 +0200 -+++ ./gas/configure.tgt 2008-01-21 15:22:03.000000000 +0100 -@@ -192,6 +192,7 @@ - i386-*-linux*oldld) fmt=aout em=linux ;; - i386-*-linux*coff*) fmt=coff em=linux ;; - i386-*-linux-*) fmt=elf em=linux ;; -+ i386-*-tyndur) fmt=elf ;; - i386-*-lynxos*) fmt=elf em=lynx ;; - i386-*-sysv[45]*) fmt=elf ;; - i386-*-solaris*) fmt=elf ;; -diff -uNr ../binutils-2.18/ld/configure.tgt ./ld/configure.tgt ---- ../binutils-2.18/ld/configure.tgt 2007-08-28 19:19:42.000000000 +0200 -+++ ./ld/configure.tgt 2008-02-08 17:55:11.000000000 +0100 -@@ -201,6 +201,10 @@ - targ_extra_libpath=elf_i386 - tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; -+i[3-7]86-*-tyndur*) -+ targ_emul=elf_i386_tyndur -+ targ_extra_emuls="elf_i386" -+ ;; - i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;; - i[3-7]86-*-solaris2*) targ_emul=elf_i386_ldso - targ_extra_emuls="elf_i386 elf_x86_64" -@@ -680,6 +684,9 @@ - *-*-linux*) - ;; - -+*-*-tyndur*) -+ NATIVE_LIB_DIRS='/system/links/lib' -+ ;; - *-*-freebsd* | *-*-dragonfly*) - ;; - -diff -uNr ../binutils-2.18/ld/emulparams/elf_i386_tyndur.sh ./ld/emulparams/elf_i386_tyndur.sh ---- ../binutils-2.18/ld/emulparams/elf_i386_tyndur.sh 1970-01-01 01:00:00.000000000 +0100 -+++ ./ld/emulparams/elf_i386_tyndur.sh 2008-02-04 08:05:57.000000000 +0100 -@@ -0,0 +1,17 @@ -+SCRIPT_NAME=elf -+OUTPUT_FORMAT="elf32-i386" -+TEXT_START_ADDR=0x40000000 -+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -+ARCH=i386 -+MACHINE= -+NOP=0x90909090 -+TEMPLATE_NAME=elf32 -+GENERATE_SHLIB_SCRIPT=yes -+GENERATE_PIE_SCRIPT=yes -+NO_SMALL_DATA=yes -+SEPARATE_GOTPLT=12 -+CTOR_START="__ctor_start__ = .;" -+CTOR_END="__ctor_end__ = .;" -+DTOR_START="__dtor_start__ = .;" -+DTOR_END="__dtor_end__ = .;" -diff -uNr ../binutils-2.18/ld/Makefile.am ./ld/Makefile.am ---- ../binutils-2.18/ld/Makefile.am 2007-08-06 22:00:17.000000000 +0200 -+++ ./ld/Makefile.am 2008-02-04 08:17:43.000000000 +0100 -@@ -1001,6 +1001,9 @@ - eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" -+eelf_i386_tyndur.c: $(srcdir)/emulparams/elf_i386_tyndur.sh \ -+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -+ ${GENSCRIPTS} elf_i386_tyndur "$(tdir_elf_i386_tyndur)" - eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \ - $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -diff -uNr ../binutils-2.18/ld/Makefile.in ./ld/Makefile.in ---- ../binutils-2.18/ld/Makefile.in 2007-08-06 22:29:54.000000000 +0200 -+++ ./ld/Makefile.in 2008-02-04 08:17:13.000000000 +0100 -@@ -452,6 +452,7 @@ - eelf_i386_chaos.o \ - eelf_i386_fbsd.o \ - eelf_i386_ldso.o \ -+ eelf_i386_tyndur.o \ - eelf_i386_vxworks.o \ - eelf_s390.o \ - egld960.o \ -@@ -1827,6 +1828,10 @@ - eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" -+eelf_i386_tyndur.c: $(srcdir)/emulparams/elf_i386_tyndur.sh \ -+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -+ ${GENSCRIPTS} elf_i386_tyndur "$(tdir_elf_i386_tyndur)" -+ - eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \ - $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -diff -uNr ../binutils-2.18/libiberty/configure ./libiberty/configure ---- ../binutils-2.18/libiberty/configure 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/configure 2008-01-21 15:22:03.000000000 +0100 -@@ -8520,6 +8520,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-tyndur*) pexecute=./pex-tyndur.o ;; - *) pexecute=./pex-unix.o ;; - esac - -diff -uNr ../binutils-2.18/libiberty/configure.ac ./libiberty/configure.ac ---- ../binutils-2.18/libiberty/configure.ac 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/configure.ac 2008-01-21 15:22:03.000000000 +0100 -@@ -682,6 +682,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-tyndur*) pexecute=./pex-tyndur.o ;; - *) pexecute=./pex-unix.o ;; - esac - AC_SUBST(pexecute) -diff -uNr ../binutils-2.18/libiberty/Makefile.in ./libiberty/Makefile.in ---- ../binutils-2.18/libiberty/Makefile.in 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/Makefile.in 2008-01-21 15:22:03.000000000 +0100 -@@ -140,7 +140,7 @@ - objalloc.c obstack.c \ - partition.c pexecute.c \ - pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ -- pex-unix.c pex-win32.c \ -+ pex-unix.c pex-win32.c pex-tyndur.c \ - physmem.c putenv.c \ - random.c regex.c rename.c rindex.c \ - safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \ -@@ -857,6 +857,13 @@ - else true; fi - $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) - -+./pex-tyndur.o: $(srcdir)/pex-tyndur.c stamp-h $(INCDIR)/ansidecl.h \ -+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h -+ if [ x"$(PICFLAG)" != x ]; then \ -+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-tyndur.c -o pic/$@; \ -+ else true; fi -+ $(COMPILE.c) $(srcdir)/pex-tyndur.c $(OUTPUT_OPTION) -+ - ./pex-msdos.o: $(srcdir)/pex-msdos.c stamp-h $(INCDIR)/ansidecl.h \ - $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ - $(INCDIR)/safe-ctype.h -diff -uNr ../binutils-2.18/libiberty/pex-tyndur.c ./libiberty/pex-tyndur.c ---- ../binutils-2.18/libiberty/pex-tyndur.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./libiberty/pex-tyndur.c 2008-01-21 15:22:03.000000000 +0100 -@@ -0,0 +1,154 @@ -+/* Utilities to execute a program in a subprocess (possibly linked by pipes -+ with other subprocesses), and wait for it. Generic Unix version -+ (also used for UWIN and VMS). -+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -+ Free Software Foundation, Inc. -+ -+This file is part of the libiberty library. -+Libiberty is free software; you can redistribute it and/or -+modify it under the terms of the GNU Library General Public -+License as published by the Free Software Foundation; either -+version 2 of the License, or (at your option) any later version. -+ -+Libiberty is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+Library General Public License for more details. -+ -+You should have received a copy of the GNU Library General Public -+License along with libiberty; see the file COPYING.LIB. If not, -+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, -+Boston, MA 02110-1301, USA. */ -+ -+#include "config.h" -+#include "libiberty.h" -+#include "pex-common.h" -+ -+#include -+#include -+#include -+#include -+#ifdef NEED_DECLARATION_ERRNO -+extern int errno; -+#endif -+#ifdef HAVE_STDLIB_H -+#include -+#endif -+#ifdef HAVE_STRING_H -+#include -+#endif -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+ -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+#ifdef HAVE_SYS_WAIT_H -+#include -+#endif -+#ifdef HAVE_GETRUSAGE -+#include -+#include -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include -+#endif -+ -+ -+static int pex_tyndur_open_read (struct pex_obj *, const char *, int); -+static int pex_tyndur_open_write (struct pex_obj *, const char *, int); -+static long pex_tyndur_exec_child (struct pex_obj *, int, const char *, -+ char * const *, char * const *, -+ int, int, int, int, -+ const char **, int *); -+static int pex_tyndur_close (struct pex_obj *, int); -+static int pex_tyndur_wait (struct pex_obj *, long, int *, struct pex_time *, -+ int, const char **, int *); -+static int pex_tyndur_pipe (struct pex_obj *, int *, int); -+static FILE *pex_tyndur_fdopenr (struct pex_obj *, int, int); -+static FILE *pex_tyndur_fdopenw (struct pex_obj *, int, int); -+static void pex_tyndur_cleanup (struct pex_obj *); -+ -+/* The list of functions we pass to the common routines. */ -+ -+const struct pex_funcs funcs = -+{ -+ pex_tyndur_open_read, -+ pex_tyndur_open_write, -+ pex_tyndur_exec_child, -+ pex_tyndur_close, -+ pex_tyndur_wait, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+ -+/* Return a newly initialized pex_obj structure. */ -+ -+struct pex_obj * -+pex_init (int flags, const char *pname, const char *tempbase) -+{ -+ return pex_init_common (flags, pname, tempbase, &funcs); -+} -+ -+/* Open a file for reading. */ -+ -+static int -+pex_tyndur_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ return open (name, O_RDONLY); -+} -+ -+/* Open a file for writing. */ -+ -+static int -+pex_tyndur_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ /* Note that we can't use O_EXCL here because gcc may have already -+ created the temporary file via make_temp_file. */ -+ return open (name, O_WRONLY | O_CREAT | O_TRUNC); -+} -+ -+/* Close a file. */ -+ -+static int -+pex_tyndur_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) -+{ -+ return close (fd); -+} -+ -+/* Execute a child. */ -+static long -+pex_tyndur_exec_child (struct pex_obj *obj, int flags, const char *executable, -+ char * const * argv, char * const * env, -+ int in, int out, int errdes, -+ int toclose, const char **errmsg, int *err) -+{ -+ // FIXME -+ return -1; -+} -+ -+/* Wait for a child process to complete. */ -+ -+static int -+pex_tyndur_wait (struct pex_obj *obj, long pid, int *status, -+ struct pex_time *time, int done, const char **errmsg, -+ int *err) -+{ -+ /* If we are cleaning up when the caller didn't retrieve process -+ status for some reason, encourage the process to go away. */ -+ if (done) -+ kill (pid, SIGTERM); -+ -+ // FIXME -+ while (get_parent_pid(pid) != 0); -+ *status = 0; -+ return 0; -+} -+ ---- ../binutils-2.18/configure 2007-08-06 22:29:40.000000000 +0200 -+++ ../binutils-2.18-new/configure 2008-06-05 19:40:52.000000000 +0200 -@@ -6127,12 +6127,12 @@ - - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. -- if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -- : -- else -- MAKEINFO="$MISSING makeinfo" -- fi -+ #if ${MAKEINFO} --version \ -+ # | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ # : -+ #else -+ # MAKEINFO="$MISSING makeinfo" -+ #fi - ;; - - esac diff --git a/patches/binutils/2.18/oldbinutils.patch b/patches/binutils/2.18/oldbinutils.patch deleted file mode 100644 index 0448401..0000000 --- a/patches/binutils/2.18/oldbinutils.patch +++ /dev/null @@ -1,278 +0,0 @@ -diff -r -u -N ../binutils-2.18/bfd/config.bfd ./bfd/config.bfd ---- ../binutils-2.18/bfd/config.bfd 2007-08-28 19:19:33.000000000 +0200 -+++ ./bfd/config.bfd 2007-12-31 12:04:35.000000000 +0100 -@@ -575,6 +575,11 @@ - targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec" - targ64_selvecs=bfd_elf64_x86_64_vec - ;; -+ i[3-7]86-*-lost) -+ targ_defvec=bfd_elf32_i386_vec -+ targ_selvecs=bfd_elf32_i386_vec -+ targ64_selvecs=bfd_elf64_x86_64_vec -+ ;; - #ifdef BFD64 - x86_64-*-elf*) - targ_defvec=bfd_elf64_x86_64_vec -diff -r -u -N ../binutils-2.18/config.sub ./config.sub ---- ../binutils-2.18/config.sub 2007-08-06 22:00:30.000000000 +0200 -+++ ./config.sub 2007-12-31 12:04:46.000000000 +0100 -@@ -121,8 +121,8 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -+ lost | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | \ -+ netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -1256,6 +1256,9 @@ - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -+ -lost*) -+ os=-lost -+ ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; -diff -r -u -N ../binutils-2.18/gas/configure.tgt ./gas/configure.tgt ---- ../binutils-2.18/gas/configure.tgt 2007-08-28 19:19:36.000000000 +0200 -+++ ./gas/configure.tgt 2007-12-31 12:11:03.000000000 +0100 -@@ -192,6 +192,7 @@ - i386-*-linux*oldld) fmt=aout em=linux ;; - i386-*-linux*coff*) fmt=coff em=linux ;; - i386-*-linux-*) fmt=elf em=linux ;; -+ i386-*-lost) fmt=elf ;; - i386-*-lynxos*) fmt=elf em=lynx ;; - i386-*-sysv[45]*) fmt=elf ;; - i386-*-solaris*) fmt=elf ;; -diff -r -u -N ../binutils-2.18/ld/configure.tgt ./ld/configure.tgt ---- ../binutils-2.18/ld/configure.tgt 2007-08-28 19:19:42.000000000 +0200 -+++ ./ld/configure.tgt 2008-01-05 22:16:40.000000000 +0100 -@@ -201,6 +201,7 @@ - targ_extra_libpath=elf_i386 - tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; -+i[3-7]86-*-lost) targ_emul=elf_i386 ;; - i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;; - i[3-7]86-*-solaris2*) targ_emul=elf_i386_ldso - targ_extra_emuls="elf_i386 elf_x86_64" -@@ -680,6 +680,9 @@ - *-*-linux*) - ;; - -+*-*-lost*) -+ NATIVE_LIB_DIRS='/system/links/lib' -+ ;; - *-*-freebsd* | *-*-dragonfly*) - ;; - -Dateien ../binutils-2.18/ld/emultempl/spu_ovl.o und ./ld/emultempl/spu_ovl.o sind verschieden. -diff -r -u -N ../binutils-2.18/libiberty/configure ./libiberty/configure ---- ../binutils-2.18/libiberty/configure 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/configure 2008-01-06 12:19:47.000000000 +0100 -@@ -8520,6 +8520,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-lost*) pexecute=./pex-lost.o ;; - *) pexecute=./pex-unix.o ;; - esac - -diff -r -u -N ../binutils-2.18/libiberty/configure.ac ./libiberty/configure.ac ---- ../binutils-2.18/libiberty/configure.ac 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/configure.ac 2008-01-06 12:02:13.000000000 +0100 -@@ -682,6 +682,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-lost*) pexecute=./pex-lost.o ;; - *) pexecute=./pex-unix.o ;; - esac - AC_SUBST(pexecute) -diff -r -u -N ../binutils-2.18/libiberty/Makefile.in ./libiberty/Makefile.in ---- ../binutils-2.18/libiberty/Makefile.in 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/Makefile.in 2008-01-06 12:26:05.000000000 +0100 -@@ -140,7 +140,7 @@ - objalloc.c obstack.c \ - partition.c pexecute.c \ - pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ -- pex-unix.c pex-win32.c \ -+ pex-unix.c pex-win32.c pex-lost.c \ - physmem.c putenv.c \ - random.c regex.c rename.c rindex.c \ - safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \ -@@ -857,6 +857,13 @@ - else true; fi - $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) - -+./pex-lost.o: $(srcdir)/pex-lost.c stamp-h $(INCDIR)/ansidecl.h \ -+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h -+ if [ x"$(PICFLAG)" != x ]; then \ -+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-lost.c -o pic/$@; \ -+ else true; fi -+ $(COMPILE.c) $(srcdir)/pex-lost.c $(OUTPUT_OPTION) -+ - ./pex-msdos.o: $(srcdir)/pex-msdos.c stamp-h $(INCDIR)/ansidecl.h \ - $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ - $(INCDIR)/safe-ctype.h -diff -r -u -N ../binutils-2.18/libiberty/pex-lost.c ./libiberty/pex-lost.c ---- ../binutils-2.18/libiberty/pex-lost.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./libiberty/pex-lost.c 2008-01-06 12:27:33.000000000 +0100 -@@ -0,0 +1,154 @@ -+/* Utilities to execute a program in a subprocess (possibly linked by pipes -+ with other subprocesses), and wait for it. Generic Unix version -+ (also used for UWIN and VMS). -+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -+ Free Software Foundation, Inc. -+ -+This file is part of the libiberty library. -+Libiberty is free software; you can redistribute it and/or -+modify it under the terms of the GNU Library General Public -+License as published by the Free Software Foundation; either -+version 2 of the License, or (at your option) any later version. -+ -+Libiberty is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+Library General Public License for more details. -+ -+You should have received a copy of the GNU Library General Public -+License along with libiberty; see the file COPYING.LIB. If not, -+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, -+Boston, MA 02110-1301, USA. */ -+ -+#include "config.h" -+#include "libiberty.h" -+#include "pex-common.h" -+ -+#include -+#include -+#include -+#include -+#ifdef NEED_DECLARATION_ERRNO -+extern int errno; -+#endif -+#ifdef HAVE_STDLIB_H -+#include -+#endif -+#ifdef HAVE_STRING_H -+#include -+#endif -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+ -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+#ifdef HAVE_SYS_WAIT_H -+#include -+#endif -+#ifdef HAVE_GETRUSAGE -+#include -+#include -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include -+#endif -+ -+ -+static int pex_lost_open_read (struct pex_obj *, const char *, int); -+static int pex_lost_open_write (struct pex_obj *, const char *, int); -+static long pex_lost_exec_child (struct pex_obj *, int, const char *, -+ char * const *, char * const *, -+ int, int, int, int, -+ const char **, int *); -+static int pex_lost_close (struct pex_obj *, int); -+static int pex_lost_wait (struct pex_obj *, long, int *, struct pex_time *, -+ int, const char **, int *); -+static int pex_lost_pipe (struct pex_obj *, int *, int); -+static FILE *pex_lost_fdopenr (struct pex_obj *, int, int); -+static FILE *pex_lost_fdopenw (struct pex_obj *, int, int); -+static void pex_lost_cleanup (struct pex_obj *); -+ -+/* The list of functions we pass to the common routines. */ -+ -+const struct pex_funcs funcs = -+{ -+ pex_lost_open_read, -+ pex_lost_open_write, -+ pex_lost_exec_child, -+ pex_lost_close, -+ pex_lost_wait, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+ -+/* Return a newly initialized pex_obj structure. */ -+ -+struct pex_obj * -+pex_init (int flags, const char *pname, const char *tempbase) -+{ -+ return pex_init_common (flags, pname, tempbase, &funcs); -+} -+ -+/* Open a file for reading. */ -+ -+static int -+pex_lost_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ return open (name, O_RDONLY); -+} -+ -+/* Open a file for writing. */ -+ -+static int -+pex_lost_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ /* Note that we can't use O_EXCL here because gcc may have already -+ created the temporary file via make_temp_file. */ -+ return open (name, O_WRONLY | O_CREAT | O_TRUNC); -+} -+ -+/* Close a file. */ -+ -+static int -+pex_lost_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) -+{ -+ return close (fd); -+} -+ -+/* Execute a child. */ -+static long -+pex_lost_exec_child (struct pex_obj *obj, int flags, const char *executable, -+ char * const * argv, char * const * env, -+ int in, int out, int errdes, -+ int toclose, const char **errmsg, int *err) -+{ -+ // FIXME -+ return -1; -+} -+ -+/* Wait for a child process to complete. */ -+ -+static int -+pex_lost_wait (struct pex_obj *obj, long pid, int *status, -+ struct pex_time *time, int done, const char **errmsg, -+ int *err) -+{ -+ /* If we are cleaning up when the caller didn't retrieve process -+ status for some reason, encourage the process to go away. */ -+ if (done) -+ kill (pid, SIGTERM); -+ -+ // FIXME -+ while (get_parent_pid(pid) != 0); -+ *status = 0; -+ return 0; -+} -+ diff --git a/patches/binutils/2.21/binutils-2.21.patch b/patches/binutils/2.21/binutils-2.21.patch new file mode 100644 index 0000000..4e02ef3 --- /dev/null +++ b/patches/binutils/2.21/binutils-2.21.patch @@ -0,0 +1,336 @@ +diff -uNr ../binutils-2.21/bfd/config.bfd ./bfd/config.bfd +--- ../binutils-2.21/bfd/config.bfd 2007-08-28 19:19:33.000000000 +0200 ++++ ./bfd/config.bfd 2008-01-21 15:22:03.000000000 +0100 +@@ -600,6 +600,11 @@ + targ_selvecs="i386linux_vec i386pei_vec" + targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec" + ;; ++ i[3-7]86-*-tyndur) ++ targ_defvec=bfd_elf32_i386_vec ++ targ_selvecs=bfd_elf32_i386_vec ++ targ64_selvecs=bfd_elf64_x86_64_vec ++ ;; + #ifdef BFD64 + x86_64-*-darwin*) + targ_defvec=mach_o_x86_64_vec +diff -uNr ../binutils-2.21/config.sub ./config.sub +--- ../binutils-2.21/config.sub 2007-08-06 22:00:30.000000000 +0200 ++++ ./config.sub 2008-01-21 15:22:03.000000000 +0100 +@@ -127,8 +127,8 @@ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ +- kopensolaris*-gnu* | \ +- storm-chaos* | os2-emx* | rtmk-nova*) ++ tyndur | kopensolaris*-gnu* | \ ++ netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -1347,6 +1347,9 @@ + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; ++ -tyndur*) ++ os=-tyndur ++ ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; +diff -uNr ../binutils-2.21/gas/configure.tgt ./gas/configure.tgt +--- ../binutils-2.21/gas/configure.tgt 2007-08-28 19:19:36.000000000 +0200 ++++ ./gas/configure.tgt 2008-01-21 15:22:03.000000000 +0100 +@@ -199,6 +199,7 @@ + i386-*-linux*oldld) fmt=aout em=linux ;; + i386-*-linux*coff*) fmt=coff em=linux ;; + i386-*-linux-*) fmt=elf em=linux ;; ++ i386-*-tyndur) fmt=elf ;; + i386-*-lynxos*) fmt=elf em=lynx ;; + i386-*-sysv[45]*) fmt=elf ;; + i386-*-solaris*) fmt=elf em=solaris ;; +diff -uNr ../binutils-2.21/ld/configure.tgt ./ld/configure.tgt +--- ../binutils-2.21/ld/configure.tgt 2007-08-28 19:19:42.000000000 +0200 ++++ ./ld/configure.tgt 2008-02-08 17:55:11.000000000 +0100 +@@ -207,6 +207,10 @@ + targ_extra_libpath=elf_i386 + tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` + tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; ++i[3-7]86-*-tyndur*) ++ targ_emul=elf_i386_tyndur ++ targ_extra_emuls="elf_i386" ++ ;; + i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;; + i[3-7]86-*-solaris2*) targ_emul=elf_i386_sol2 + targ_extra_emuls="elf_i386_ldso elf_i386 elf_x86_64_sol2 elf_x86_64 elf_l1om" +@@ -706,6 +706,9 @@ + *-*-linux*) + ;; + ++*-*-tyndur*) ++ NATIVE_LIB_DIRS='/system/links/lib' ++ ;; + *-*-freebsd* | *-*-dragonfly*) + ;; + +diff -uNr ../binutils-2.21/ld/emulparams/elf_i386_tyndur.sh ./ld/emulparams/elf_i386_tyndur.sh +--- ../binutils-2.21/ld/emulparams/elf_i386_tyndur.sh 1970-01-01 01:00:00.000000000 +0100 ++++ ./ld/emulparams/elf_i386_tyndur.sh 2008-02-04 08:05:57.000000000 +0100 +@@ -0,0 +1,17 @@ ++SCRIPT_NAME=elf ++OUTPUT_FORMAT="elf32-i386" ++TEXT_START_ADDR=0x40000000 ++MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ++COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ++ARCH=i386 ++MACHINE= ++NOP=0x90909090 ++TEMPLATE_NAME=elf32 ++GENERATE_SHLIB_SCRIPT=yes ++GENERATE_PIE_SCRIPT=yes ++NO_SMALL_DATA=yes ++SEPARATE_GOTPLT=12 ++CTOR_START="__ctor_start__ = .;" ++CTOR_END="__ctor_end__ = .;" ++DTOR_START="__dtor_start__ = .;" ++DTOR_END="__dtor_end__ = .;" +diff -uNr ../binutils-2.21/ld/Makefile.am ./ld/Makefile.am +--- ../binutils-2.21/ld/Makefile.am 2007-08-06 22:00:17.000000000 +0200 ++++ ./ld/Makefile.am 2008-02-04 08:17:43.000000000 +0100 +@@ -1196,6 +1196,9 @@ + eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ + $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" ++eelf_i386_tyndur.c: $(srcdir)/emulparams/elf_i386_tyndur.sh \ ++ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ++ ${GENSCRIPTS} elf_i386_tyndur "$(tdir_elf_i386_tyndur)" + eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \ + $(srcdir)/emulparams/solaris2.sh \ + $(srcdir)/emultempl/solaris2.em \ +diff -uNr ../binutils-2.21/ld/Makefile.in ./ld/Makefile.in +--- ../binutils-2.21/ld/Makefile.in 2007-08-06 22:29:54.000000000 +0200 ++++ ./ld/Makefile.in 2008-02-04 08:17:13.000000000 +0100 +@@ -538,6 +538,7 @@ + eelf_i386_chaos.c \ + eelf_i386_fbsd.c \ + eelf_i386_ldso.c \ ++ eelf_i386_tyndur.o \ + eelf_i386_sol2.c \ + eelf_i386_vxworks.c \ + eelf_s390.c \ +@@ -2619,6 +2619,10 @@ + eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ + $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" ++eelf_i386_tyndur.c: $(srcdir)/emulparams/elf_i386_tyndur.sh \ ++ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ++ ${GENSCRIPTS} elf_i386_tyndur "$(tdir_elf_i386_tyndur)" ++ + eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \ + $(srcdir)/emulparams/solaris2.sh \ + $(srcdir)/emultempl/solaris2.em \ +diff -uNr ../binutils-2.21/libiberty/configure ./libiberty/configure +--- ../binutils-2.21/libiberty/configure 2007-08-06 21:59:45.000000000 +0200 ++++ ./libiberty/configure 2008-01-21 15:22:03.000000000 +0100 +@@ -6579,6 +6579,7 @@ + *-*-mingw* | *-*-winnt*) pexecute=pex-win32 ;; + *-*-msdosdjgpp*) pexecute=pex-djgpp ;; + *-*-msdos*) pexecute=pex-msdos ;; ++ *-*-tyndur*) pexecute=./pex-tyndur.o ;; + *) pexecute=pex-unix ;; + esac + +diff -uNr ../binutils-2.21/libiberty/configure.ac ./libiberty/configure.ac +--- ../binutils-2.21/libiberty/configure.ac 2007-08-06 21:59:45.000000000 +0200 ++++ ./libiberty/configure.ac 2008-01-21 15:22:03.000000000 +0100 +@@ -689,6 +689,7 @@ + *-*-mingw* | *-*-winnt*) pexecute=pex-win32 ;; + *-*-msdosdjgpp*) pexecute=pex-djgpp ;; + *-*-msdos*) pexecute=pex-msdos ;; ++ *-*-tyndur*) pexecute=./pex-tyndur.o ;; + *) pexecute=pex-unix ;; + esac + AC_SUBST(pexecute) +diff -uNr ../binutils-2.21/libiberty/Makefile.in ./libiberty/Makefile.in +--- ../binutils-2.21/libiberty/Makefile.in 2007-08-06 21:59:45.000000000 +0200 ++++ ./libiberty/Makefile.in 2008-01-21 15:22:03.000000000 +0100 +@@ -141,7 +141,7 @@ + objalloc.c obstack.c \ + partition.c pexecute.c \ + pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ +- pex-unix.c pex-win32.c \ ++ pex-unix.c pex-win32.c pex-tyndur.c \ + physmem.c putenv.c \ + random.c regex.c rename.c rindex.c \ + safe-ctype.c setenv.c setproctitle.c sha1.c sigsetmask.c \ +@@ -866,6 +866,13 @@ + else true; fi + $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) + ++./pex-tyndur.o: $(srcdir)/pex-tyndur.c stamp-h $(INCDIR)/ansidecl.h \ ++ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h ++ if [ x"$(PICFLAG)" != x ]; then \ ++ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-tyndur.c -o pic/$@; \ ++ else true; fi ++ $(COMPILE.c) $(srcdir)/pex-tyndur.c $(OUTPUT_OPTION) ++ + ./pex-msdos.$(objext): $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ + $(INCDIR)/safe-ctype.h +diff -uNr ../binutils-2.21/libiberty/pex-tyndur.c ./libiberty/pex-tyndur.c +--- ../binutils-2.21/libiberty/pex-tyndur.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./libiberty/pex-tyndur.c 2008-01-21 15:22:03.000000000 +0100 +@@ -0,0 +1,154 @@ ++/* Utilities to execute a program in a subprocess (possibly linked by pipes ++ with other subprocesses), and wait for it. Generic Unix version ++ (also used for UWIN and VMS). ++ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ++ Free Software Foundation, Inc. ++ ++This file is part of the libiberty library. ++Libiberty is free software; you can redistribute it and/or ++modify it under the terms of the GNU Library General Public ++License as published by the Free Software Foundation; either ++version 2 of the License, or (at your option) any later version. ++ ++Libiberty is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++Library General Public License for more details. ++ ++You should have received a copy of the GNU Library General Public ++License along with libiberty; see the file COPYING.LIB. If not, ++write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, ++Boston, MA 02110-1301, USA. */ ++ ++#include "config.h" ++#include "libiberty.h" ++#include "pex-common.h" ++ ++#include ++#include ++#include ++#include ++#ifdef NEED_DECLARATION_ERRNO ++extern int errno; ++#endif ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++#ifdef HAVE_STRING_H ++#include ++#endif ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++ ++#include ++ ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++#ifdef HAVE_SYS_WAIT_H ++#include ++#endif ++#ifdef HAVE_GETRUSAGE ++#include ++#include ++#endif ++#ifdef HAVE_SYS_STAT_H ++#include ++#endif ++ ++ ++static int pex_tyndur_open_read (struct pex_obj *, const char *, int); ++static int pex_tyndur_open_write (struct pex_obj *, const char *, int); ++static long pex_tyndur_exec_child (struct pex_obj *, int, const char *, ++ char * const *, char * const *, ++ int, int, int, int, ++ const char **, int *); ++static int pex_tyndur_close (struct pex_obj *, int); ++static int pex_tyndur_wait (struct pex_obj *, long, int *, struct pex_time *, ++ int, const char **, int *); ++static int pex_tyndur_pipe (struct pex_obj *, int *, int); ++static FILE *pex_tyndur_fdopenr (struct pex_obj *, int, int); ++static FILE *pex_tyndur_fdopenw (struct pex_obj *, int, int); ++static void pex_tyndur_cleanup (struct pex_obj *); ++ ++/* The list of functions we pass to the common routines. */ ++ ++const struct pex_funcs funcs = ++{ ++ pex_tyndur_open_read, ++ pex_tyndur_open_write, ++ pex_tyndur_exec_child, ++ pex_tyndur_close, ++ pex_tyndur_wait, ++ NULL, ++ NULL, ++ NULL, ++ NULL ++}; ++ ++/* Return a newly initialized pex_obj structure. */ ++ ++struct pex_obj * ++pex_init (int flags, const char *pname, const char *tempbase) ++{ ++ return pex_init_common (flags, pname, tempbase, &funcs); ++} ++ ++/* Open a file for reading. */ ++ ++static int ++pex_tyndur_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, ++ int binary ATTRIBUTE_UNUSED) ++{ ++ return open (name, O_RDONLY); ++} ++ ++/* Open a file for writing. */ ++ ++static int ++pex_tyndur_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, ++ int binary ATTRIBUTE_UNUSED) ++{ ++ /* Note that we can't use O_EXCL here because gcc may have already ++ created the temporary file via make_temp_file. */ ++ return open (name, O_WRONLY | O_CREAT | O_TRUNC); ++} ++ ++/* Close a file. */ ++ ++static int ++pex_tyndur_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) ++{ ++ return close (fd); ++} ++ ++/* Execute a child. */ ++static long ++pex_tyndur_exec_child (struct pex_obj *obj, int flags, const char *executable, ++ char * const * argv, char * const * env, ++ int in, int out, int errdes, ++ int toclose, const char **errmsg, int *err) ++{ ++ // FIXME ++ return -1; ++} ++ ++/* Wait for a child process to complete. */ ++ ++static int ++pex_tyndur_wait (struct pex_obj *obj, long pid, int *status, ++ struct pex_time *time, int done, const char **errmsg, ++ int *err) ++{ ++ /* If we are cleaning up when the caller didn't retrieve process ++ status for some reason, encourage the process to go away. */ ++ if (done) ++ kill (pid, SIGTERM); ++ ++ // FIXME ++ while (get_parent_pid(pid) != 0); ++ *status = 0; ++ return 0; ++} ++ diff --git a/patches/gcc/4.2.2/gcc-4.2.2.patch b/patches/gcc/4.2.2/gcc-4.2.2.patch deleted file mode 100644 index 94a337a..0000000 --- a/patches/gcc/4.2.2/gcc-4.2.2.patch +++ /dev/null @@ -1,454 +0,0 @@ -diff -urN ../gcc-4.2.2/config.sub ./config.sub ---- ../gcc-4.2.2/config.sub 2006-10-16 05:27:17.000000000 +0200 -+++ ./config.sub 2008-01-27 09:42:49.000000000 +0100 -@@ -121,8 +121,8 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -+ tyndur* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | \ -+ netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -1249,6 +1249,9 @@ - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -+ -tyndur*) -+ os=-tyndur -+ ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; -diff -urN ../gcc-4.2.2/gcc/config/i386/tyndur.h ./gcc/config/i386/tyndur.h ---- ../gcc-4.2.2/gcc/config/i386/tyndur.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./gcc/config/i386/tyndur.h 2008-01-27 09:42:49.000000000 +0100 -@@ -0,0 +1,56 @@ -+/* Definitions for Intel 386 running Linux-based GNU systems with ELF format. -+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2005, -+ 2006, 2007 Free Software Foundation, Inc. -+ Contributed by Eric Youngdale. -+ Modified for stabs-in-ELF by H.J. Lu. -+ Adapted from linux.h by Antoine Kaufmann -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+/* Output at beginning of assembler file. */ -+/* The .file command should always begin the output. */ -+#define TARGET_ASM_FILE_START_FILE_DIRECTIVE true -+ -+#define TARGET_VERSION fprintf (stderr, " (i386 TYNDUR/ELF)"); -+ -+/* The svr4 ABI for the i386 says that records and unions are returned -+ in memory. */ -+#undef DEFAULT_PCC_STRUCT_RETURN -+#define DEFAULT_PCC_STRUCT_RETURN 1 -+ -+#undef ASM_COMMENT_START -+#define ASM_COMMENT_START "#" -+ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "long int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE BITS_PER_WORD -+ -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ TYNDUR_TARGET_OS_CPP_BUILTINS(); \ -+ } \ -+ while (0) -+ -diff -urN ../gcc-4.2.2/gcc/config/tyndur.h ./gcc/config/tyndur.h ---- ../gcc-4.2.2/gcc/config/tyndur.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./gcc/config/tyndur.h 2008-02-10 17:17:37.000000000 +0100 -@@ -0,0 +1,59 @@ -+/* Definitions for Linux-based GNU systems with ELF format -+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2006, -+ 2007 Free Software Foundation, Inc. -+ Contributed by Eric Youngdale. -+ Modified for stabs-in-ELF by H.J. Lu (hjl at lucon.org). -+ Adapted from linux.h by Antoine Kaufmann -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+/* Don't assume anything about the header files. */ -+#define NO_IMPLICIT_EXTERN_C -+ -+/* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add -+ the GNU/Linux magical crtbegin.o file (see crtstuff.c) which -+ provides part of the support for getting C++ file-scope static -+ object constructed before entering `main'. */ -+ -+#undef STARTFILE_SPEC -+#define STARTFILE_SPEC \ -+ "crtbegin.o%s -l:crttyndur.o" -+ -+/* Provide a ENDFILE_SPEC appropriate for GNU/Linux. Here we tack on -+ the GNU/Linux magical crtend.o file (see crtstuff.c) which -+ provides part of the support for getting C++ file-scope static -+ object constructed before entering `main', followed by a normal -+ GNU/Linux "finalizer" file, `crtn.o'. */ -+ -+#undef ENDFILE_SPEC -+#define ENDFILE_SPEC \ -+ "crtend.o%s" -+ -+#define TYNDUR_TARGET_OS_CPP_BUILTINS() \ -+ do { \ -+ builtin_define ("__TYNDUR__"); \ -+ builtin_define_std ("TYNDUR"); \ -+ builtin_assert ("system=TYNDUR"); \ -+ } while (0) -+ -+#define LINK_GCC_C_SEQUENCE_SPEC \ -+ "--start-group %G %L --end-group" -+ -+#undef LINK_SPEC -+#define LINK_SPEC " %D %{shared:-shared}" -+ -+ -diff -urN ../gcc-4.2.2/gcc/config/t-tyndur ./gcc/config/t-tyndur ---- ../gcc-4.2.2/gcc/config/t-tyndur 1970-01-01 01:00:00.000000000 +0100 -+++ ./gcc/config/t-tyndur 2008-02-07 23:15:57.000000000 +0100 -@@ -0,0 +1,9 @@ -+# Compile crtbeginS.o and crtendS.o with pic. -+CRTSTUFF_T_CFLAGS_S = -fPIC -+ -+# Compile libgcc.a with pic. -+TARGET_LIBGCC2_CFLAGS += -fPIC -+ -+SYSTEM_HEADER_DIR = $(prefix)/system/links/include -+CROSS_SYSTEM_HEADER_DIR = $(prefix)/system/links/include -+inhibit_libc='true' -diff -urN ../gcc-4.2.2/gcc/config.gcc ./gcc/config.gcc ---- ../gcc-4.2.2/gcc/config.gcc 2007-09-01 17:28:30.000000000 +0200 -+++ ./gcc/config.gcc 2008-02-03 14:38:18.000000000 +0100 -@@ -500,6 +500,13 @@ - # Assume that glibc is being used and so __cxa_atexit is provided. - default_use_cxa_atexit=yes - ;; -+*-*-tyndur*) -+ gas=yes -+ gnu_ld=yes -+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" -+ tmake_file="t-slibgcc-elf-ver t-tyndur" -+ ;; -+ - *-*-netbsd*) - tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic" - gas=yes -@@ -1116,6 +1123,12 @@ - gnu_ld=yes - gas=yes - ;; -+i[34567]86-*-tyndur*) -+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h tyndur.h \ -+ i386/tyndur.h" -+ tmake_file="i386/t-i386elf i386/t-crtstuff t-tyndur" -+ ;; -+ - i[34567]86-*-lynxos*) - xm_defines=POSIX - tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/lynx.h lynx.h" -diff -urN ../gcc-4.2.2/gcc/c-opts.c ./gcc/c-opts.c ---- ../gcc-4.2.2/gcc/c-opts.c 2007-09-01 17:28:30.000000000 +0200 -+++ ./gcc/c-opts.c 2008-01-27 09:42:49.000000000 +0100 -@@ -326,7 +326,7 @@ - error ("-I- specified twice"); - quote_chain_split = true; - split_quote_chain (); -- inform ("obsolete option -I- used, please use -iquote instead"); -+ // inform ("obsolete option -I- used, please use -iquote instead"); - } - break; - -diff -urN ../gcc-4.2.2/libiberty/configure ./libiberty/configure ---- ../gcc-4.2.2/libiberty/configure 2006-08-30 15:46:50.000000000 +0200 -+++ ./libiberty/configure 2008-01-27 09:42:50.000000000 +0100 -@@ -8403,6 +8403,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-tyndur*) pexecute=./pex-tyndur.o ;; - *) pexecute=./pex-unix.o ;; - esac - -diff -urN ../gcc-4.2.2/libiberty/configure.ac ./libiberty/configure.ac ---- ../gcc-4.2.2/libiberty/configure.ac 2006-08-30 15:46:50.000000000 +0200 -+++ ./libiberty/configure.ac 2008-01-27 09:42:50.000000000 +0100 -@@ -663,6 +663,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-tyndur*) pexecute=./pex-tyndur.o ;; - *) pexecute=./pex-unix.o ;; - esac - AC_SUBST(pexecute) -diff -urN ../gcc-4.2.2/libiberty/Makefile.in ./libiberty/Makefile.in ---- ../gcc-4.2.2/libiberty/Makefile.in 2007-03-03 20:29:51.000000000 +0100 -+++ ./libiberty/Makefile.in 2008-01-27 09:42:50.000000000 +0100 -@@ -145,7 +145,7 @@ - objalloc.c obstack.c \ - partition.c pexecute.c \ - pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ -- pex-unix.c pex-win32.c \ -+ pex-unix.c pex-win32.c pex-tyndur.c \ - physmem.c putenv.c \ - random.c regex.c rename.c rindex.c \ - safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \ -@@ -843,6 +843,13 @@ - else true; fi - $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) - -+./pex-tyndur.o: $(srcdir)/pex-tyndur.c config.h $(INCDIR)/ansidecl.h \ -+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h -+ if [ x"$(PICFLAG)" != x ]; then \ -+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-tyndur.c -o pic/$@; \ -+ else true; fi -+ $(COMPILE.c) $(srcdir)/pex-tyndur.c $(OUTPUT_OPTION) -+ - ./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ - $(INCDIR)/safe-ctype.h -diff -urN ../gcc-4.2.2/libiberty/pex-tyndur.c ./libiberty/pex-tyndur.c ---- ../gcc-4.2.2/libiberty/pex-tyndur.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./libiberty/pex-tyndur.c 2008-02-10 16:39:24.000000000 +0100 -@@ -0,0 +1,200 @@ -+/* Utilities to execute a program in a subprocess (possibly linked by pipes -+ with other subprocesses), and wait for it. Generic Unix version -+ (also used for UWIN and VMS). -+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -+ Free Software Foundation, Inc. -+ -+This file is part of the libiberty library. -+Libiberty is free software; you can redistribute it and/or -+modify it under the terms of the GNU Library General Public -+License as published by the Free Software Foundation; either -+version 2 of the License, or (at your option) any later version. -+ -+Libiberty is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+Library General Public License for more details. -+ -+You should have received a copy of the GNU Library General Public -+License along with libiberty; see the file COPYING.LIB. If not, -+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, -+Boston, MA 02110-1301, USA. */ -+ -+#include "config.h" -+#include "libiberty.h" -+#include "pex-common.h" -+ -+#include -+#include -+#include -+#include -+#ifdef NEED_DECLARATION_ERRNO -+extern int errno; -+#endif -+#ifdef HAVE_STDLIB_H -+#include -+#endif -+#ifdef HAVE_STRING_H -+#include -+#endif -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+ -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+#ifdef HAVE_SYS_WAIT_H -+#include -+#endif -+#ifdef HAVE_GETRUSAGE -+#include -+#include -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include -+#endif -+ -+ -+static int pex_tyndur_open_read (struct pex_obj *, const char *, int); -+static int pex_tyndur_open_write (struct pex_obj *, const char *, int); -+static long pex_tyndur_exec_child (struct pex_obj *, int, const char *, -+ char * const *, char * const *, -+ int, int, int, int, -+ const char **, int *); -+static int pex_tyndur_close (struct pex_obj *, int); -+static int pex_tyndur_wait (struct pex_obj *, long, int *, struct pex_time *, -+ int, const char **, int *); -+static int pex_tyndur_pipe (struct pex_obj *, int *, int); -+static FILE *pex_tyndur_fdopenr (struct pex_obj *, int, int); -+static FILE *pex_tyndur_fdopenw (struct pex_obj *, int, int); -+static void pex_tyndur_cleanup (struct pex_obj *); -+ -+/* The list of functions we pass to the common routines. */ -+ -+const struct pex_funcs funcs = -+{ -+ pex_tyndur_open_read, -+ pex_tyndur_open_write, -+ pex_tyndur_exec_child, -+ pex_tyndur_close, -+ pex_tyndur_wait, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+ -+/* Return a newly initialized pex_obj structure. */ -+ -+struct pex_obj * -+pex_init (int flags, const char *pname, const char *tempbase) -+{ -+ return pex_init_common (flags, pname, tempbase, &funcs); -+} -+ -+/* Open a file for reading. */ -+ -+static int -+pex_tyndur_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ return open (name, O_RDONLY); -+} -+ -+/* Open a file for writing. */ -+ -+static int -+pex_tyndur_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ /* Note that we can't use O_EXCL here because gcc may have already -+ created the temporary file via make_temp_file. */ -+ return open (name, O_WRONLY | O_CREAT | O_TRUNC); -+} -+ -+/* Close a file. */ -+ -+static int -+pex_tyndur_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) -+{ -+ return close (fd); -+} -+ -+/* Execute a child. */ -+static long -+pex_tyndur_exec_child (struct pex_obj *obj, int flags, const char *executable, -+ char * const * argv, char * const * env, -+ int in, int out, int errdes, -+ int toclose, const char **errmsg, int *err) -+{ -+ size_t len; -+ int i; -+ long pid = 0; -+ /* TODO: We need to find some way to get the env vars to the -+ child, use the pipes and in/out/errdes. */ -+ -+ /* We are going to copy the path to the executable and all the -+ arguments into one string because there is no other possibility -+ at the moment for TYNDUR. */ -+ -+ /* Calculate the total length of the commandline. */ -+ len = strlen (executable); -+ for (i = 1; argv[i] != NULL; i++) { -+ /* Argument + space */ -+ len += strlen (argv[i]) + 1; -+ } -+ -+ /* We need a new block because of the dynamically sized array. */ -+ do { -+ char cmd[len]; -+ int pos = 0; -+ pos = strlen (executable); -+ strcpy (cmd, executable); -+ -+ for (i = 1; argv[i] != NULL; i++) { -+ cmd[pos++] = ' '; -+ strcpy (cmd + pos, argv[i]); -+ pos += strlen (argv[i]); -+ } -+ -+ /* Now that we have the command string the hard part is done. */ -+ pid = init_execute(cmd); -+ } while (0); -+ -+ if (pid == 0) { -+ *err = errno; -+ *errmsg = "pex_tyndur_exec_child"; -+ return -1; -+ } else { -+ return pid; -+ } -+} -+ -+/* Wait for a child process to complete. */ -+ -+static int -+pex_tyndur_wait (struct pex_obj *obj, long pid, int *status, -+ struct pex_time *time, int done, const char **errmsg, -+ int *err) -+{ -+ /* If we are cleaning up when the caller didn't retrieve process -+ status for some reason, encourage the process to go away. */ -+ if (done) -+ kill (pid, SIGTERM); -+ -+ /* Without wait4 or getrusage we can't get any information about -+ the resource usage. So we fill it up with zero. */ -+ if (time != NULL) -+ memset (time, 0, sizeof (struct pex_time)); -+ -+ if (waitpid (pid, status, 0) < 0) { -+ *err = errno; -+ *errmsg = "pex_tyndur_wait"; -+ return -1; -+ } -+ return 0; -+} -+ diff --git a/patches/gcc/4.5.2/gcc-4.5.2.patch b/patches/gcc/4.5.2/gcc-4.5.2.patch new file mode 100644 index 0000000..5053246 --- /dev/null +++ b/patches/gcc/4.5.2/gcc-4.5.2.patch @@ -0,0 +1,463 @@ +diff -urN ../gcc-4.5.2/config.sub ./config.sub +--- ../gcc-4.5.2/config.sub 2006-10-16 05:27:17.000000000 +0200 ++++ ./config.sub 2008-01-27 09:42:49.000000000 +0100 +@@ -127,7 +127,7 @@ + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ +- storm-chaos* | os2-emx* | rtmk-nova*) ++ tyndur* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -1345,6 +1345,9 @@ + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; ++ -tyndur*) ++ os=-tyndur ++ ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; +diff -urN ../gcc-4.5.2/gcc/config/i386/tyndur.h ./gcc/config/i386/tyndur.h +--- ../gcc-4.5.2/gcc/config/i386/tyndur.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./gcc/config/i386/tyndur.h 2008-01-27 09:42:49.000000000 +0100 +@@ -0,0 +1,56 @@ ++/* Definitions for Intel 386 running Linux-based GNU systems with ELF format. ++ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2005, ++ 2006, 2007 Free Software Foundation, Inc. ++ Contributed by Eric Youngdale. ++ Modified for stabs-in-ELF by H.J. Lu. ++ Adapted from linux.h by Antoine Kaufmann ++ ++This file is part of GCC. ++ ++GCC is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 3, or (at your option) ++any later version. ++ ++GCC is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with GCC; see the file COPYING3. If not see ++. */ ++ ++/* Output at beginning of assembler file. */ ++/* The .file command should always begin the output. */ ++#define TARGET_ASM_FILE_START_FILE_DIRECTIVE true ++ ++#define TARGET_VERSION fprintf (stderr, " (i386 TYNDUR/ELF)"); ++ ++/* The svr4 ABI for the i386 says that records and unions are returned ++ in memory. */ ++#undef DEFAULT_PCC_STRUCT_RETURN ++#define DEFAULT_PCC_STRUCT_RETURN 1 ++ ++#undef ASM_COMMENT_START ++#define ASM_COMMENT_START "#" ++ ++#undef SIZE_TYPE ++#define SIZE_TYPE "unsigned int" ++ ++#undef PTRDIFF_TYPE ++#define PTRDIFF_TYPE "int" ++ ++#undef WCHAR_TYPE ++#define WCHAR_TYPE "long int" ++ ++#undef WCHAR_TYPE_SIZE ++#define WCHAR_TYPE_SIZE BITS_PER_WORD ++ ++#define TARGET_OS_CPP_BUILTINS() \ ++ do \ ++ { \ ++ TYNDUR_TARGET_OS_CPP_BUILTINS(); \ ++ } \ ++ while (0) ++ +diff -urN ../gcc-4.5.2/gcc/config/tyndur.h ./gcc/config/tyndur.h +--- ../gcc-4.5.2/gcc/config/tyndur.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./gcc/config/tyndur.h 2008-02-10 17:17:37.000000000 +0100 +@@ -0,0 +1,59 @@ ++/* Definitions for Linux-based GNU systems with ELF format ++ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2006, ++ 2007 Free Software Foundation, Inc. ++ Contributed by Eric Youngdale. ++ Modified for stabs-in-ELF by H.J. Lu (hjl at lucon.org). ++ Adapted from linux.h by Antoine Kaufmann ++ ++This file is part of GCC. ++ ++GCC is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 3, or (at your option) ++any later version. ++ ++GCC is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with GCC; see the file COPYING3. If not see ++. */ ++ ++/* Don't assume anything about the header files. */ ++#define NO_IMPLICIT_EXTERN_C ++ ++/* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add ++ the GNU/Linux magical crtbegin.o file (see crtstuff.c) which ++ provides part of the support for getting C++ file-scope static ++ object constructed before entering `main'. */ ++ ++#undef STARTFILE_SPEC ++#define STARTFILE_SPEC \ ++ "crtbegin.o%s -l:crttyndur.o" ++ ++/* Provide a ENDFILE_SPEC appropriate for GNU/Linux. Here we tack on ++ the GNU/Linux magical crtend.o file (see crtstuff.c) which ++ provides part of the support for getting C++ file-scope static ++ object constructed before entering `main', followed by a normal ++ GNU/Linux "finalizer" file, `crtn.o'. */ ++ ++#undef ENDFILE_SPEC ++#define ENDFILE_SPEC \ ++ "crtend.o%s" ++ ++#define TYNDUR_TARGET_OS_CPP_BUILTINS() \ ++ do { \ ++ builtin_define ("__TYNDUR__"); \ ++ builtin_define_std ("TYNDUR"); \ ++ builtin_assert ("system=TYNDUR"); \ ++ } while (0) ++ ++#define LINK_GCC_C_SEQUENCE_SPEC \ ++ "--start-group %G %L --end-group" ++ ++#undef LINK_SPEC ++#define LINK_SPEC " %D %{shared:-shared}" ++ ++ +diff -urN ../gcc-4.5.2/gcc/config/t-tyndur ./gcc/config/t-tyndur +--- ../gcc-4.5.2/gcc/config/t-tyndur 1970-01-01 01:00:00.000000000 +0100 ++++ ./gcc/config/t-tyndur 2008-02-07 23:15:57.000000000 +0100 +@@ -0,0 +1,9 @@ ++# Compile crtbeginS.o and crtendS.o with pic. ++CRTSTUFF_T_CFLAGS_S = -fPIC ++ ++# Compile libgcc.a with pic. ++TARGET_LIBGCC2_CFLAGS += -fPIC ++ ++SYSTEM_HEADER_DIR = $(prefix)/system/links/include ++CROSS_SYSTEM_HEADER_DIR = $(prefix)/system/links/include ++inhibit_libc='true' +diff -urN ../gcc-4.5.2/gcc/config.gcc ./gcc/config.gcc +--- ../gcc-4.5.2/gcc/config.gcc 2007-09-01 17:28:30.000000000 +0200 ++++ ./gcc/config.gcc 2008-02-03 14:38:18.000000000 +0100 +@@ -534,6 +534,12 @@ + use_gcc_tgmath=no + use_gcc_stdint=wrap + ;; ++*-*-tyndur*) ++ gas=yes ++ gnu_ld=yes ++ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" ++ tmake_file="t-slibgcc-elf-ver t-tyndur" ++ ;; + *-*-netbsd*) + tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic" + gas=yes +@@ -1198,6 +1198,12 @@ + gas=yes + use_gcc_stdint=wrap + ;; ++i[34567]86-*-tyndur*) ++ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h tyndur.h \ ++ i386/tyndur.h" ++ tmake_file="i386/t-i386elf i386/t-crtstuff t-tyndur" ++ ;; ++ + i[34567]86-*-lynxos*) + xm_defines=POSIX + tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/lynx.h lynx.h" +diff -urN ../gcc-4.5.2/gcc/c-opts.c ./gcc/c-opts.c +--- ../gcc-4.5.2/gcc/c-opts.c 2007-09-01 17:28:30.000000000 +0200 ++++ ./gcc/c-opts.c 2008-01-27 09:42:49.000000000 +0100 +@@ -326,7 +326,7 @@ + error ("-I- specified twice"); + quote_chain_split = true; + split_quote_chain (); +- inform (input_location, "obsolete option -I- used, please use -iquote instead"); ++ // inform (input_location, "obsolete option -I- used, please use -iquote instead"); + } + break; + +diff -urN ../gcc-4.5.2/libiberty/configure ./libiberty/configure +--- ../gcc-4.5.2/libiberty/configure 2006-08-30 15:46:50.000000000 +0200 ++++ ./libiberty/configure 2008-01-27 09:42:50.000000000 +0100 +@@ -6536,6 +6536,7 @@ + *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; + *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; + *-*-msdos*) pexecute=./pex-msdos.o ;; ++ *-*-tyndur*) pexecute=./pex-tyndur.o ;; + *) pexecute=./pex-unix.o ;; + esac + +diff -urN ../gcc-4.5.2/libiberty/configure.ac ./libiberty/configure.ac +--- ../gcc-4.5.2/libiberty/configure.ac 2006-08-30 15:46:50.000000000 +0200 ++++ ./libiberty/configure.ac 2008-01-27 09:42:50.000000000 +0100 +@@ -674,6 +674,7 @@ + *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; + *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; + *-*-msdos*) pexecute=./pex-msdos.o ;; ++ *-*-tyndur*) pexecute=./pex-tyndur.o ;; + *) pexecute=./pex-unix.o ;; + esac + AC_SUBST(pexecute) +diff -urN ../gcc-4.5.2/libiberty/Makefile.in ./libiberty/Makefile.in +--- ../gcc-4.5.2/libiberty/Makefile.in 2007-03-03 20:29:51.000000000 +0100 ++++ ./libiberty/Makefile.in 2008-01-27 09:42:50.000000000 +0100 +@@ -140,7 +140,7 @@ + objalloc.c obstack.c \ + partition.c pexecute.c \ + pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ +- pex-unix.c pex-win32.c \ ++ pex-unix.c pex-win32.c pex-tyndur.c \ + physmem.c putenv.c \ + random.c regex.c rename.c rindex.c \ + safe-ctype.c setenv.c sha1.c sigsetmask.c snprintf.c sort.c \ +@@ -845,6 +845,13 @@ + else true; fi + $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) + ++./pex-tyndur.o: $(srcdir)/pex-tyndur.c config.h $(INCDIR)/ansidecl.h \ ++ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h ++ if [ x"$(PICFLAG)" != x ]; then \ ++ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-tyndur.c -o pic/$@; \ ++ else true; fi ++ $(COMPILE.c) $(srcdir)/pex-tyndur.c $(OUTPUT_OPTION) ++ + ./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ + $(INCDIR)/safe-ctype.h +diff -urN ../gcc-4.5.2/libiberty/pex-tyndur.c ./libiberty/pex-tyndur.c +--- ../gcc-4.5.2/libiberty/pex-tyndur.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./libiberty/pex-tyndur.c 2008-02-10 16:39:24.000000000 +0100 +@@ -0,0 +1,200 @@ ++/* Utilities to execute a program in a subprocess (possibly linked by pipes ++ with other subprocesses), and wait for it. Generic Unix version ++ (also used for UWIN and VMS). ++ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ++ Free Software Foundation, Inc. ++ ++This file is part of the libiberty library. ++Libiberty is free software; you can redistribute it and/or ++modify it under the terms of the GNU Library General Public ++License as published by the Free Software Foundation; either ++version 2 of the License, or (at your option) any later version. ++ ++Libiberty is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++Library General Public License for more details. ++ ++You should have received a copy of the GNU Library General Public ++License along with libiberty; see the file COPYING.LIB. If not, ++write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, ++Boston, MA 02110-1301, USA. */ ++ ++#include "config.h" ++#include "libiberty.h" ++#include "pex-common.h" ++ ++#include ++#include ++#include ++#include ++#ifdef NEED_DECLARATION_ERRNO ++extern int errno; ++#endif ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++#ifdef HAVE_STRING_H ++#include ++#endif ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++ ++#include ++ ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++#ifdef HAVE_SYS_WAIT_H ++#include ++#endif ++#ifdef HAVE_GETRUSAGE ++#include ++#include ++#endif ++#ifdef HAVE_SYS_STAT_H ++#include ++#endif ++ ++ ++static int pex_tyndur_open_read (struct pex_obj *, const char *, int); ++static int pex_tyndur_open_write (struct pex_obj *, const char *, int); ++static long pex_tyndur_exec_child (struct pex_obj *, int, const char *, ++ char * const *, char * const *, ++ int, int, int, int, ++ const char **, int *); ++static int pex_tyndur_close (struct pex_obj *, int); ++static int pex_tyndur_wait (struct pex_obj *, long, int *, struct pex_time *, ++ int, const char **, int *); ++static int pex_tyndur_pipe (struct pex_obj *, int *, int); ++static FILE *pex_tyndur_fdopenr (struct pex_obj *, int, int); ++static FILE *pex_tyndur_fdopenw (struct pex_obj *, int, int); ++static void pex_tyndur_cleanup (struct pex_obj *); ++ ++/* The list of functions we pass to the common routines. */ ++ ++const struct pex_funcs funcs = ++{ ++ pex_tyndur_open_read, ++ pex_tyndur_open_write, ++ pex_tyndur_exec_child, ++ pex_tyndur_close, ++ pex_tyndur_wait, ++ NULL, ++ NULL, ++ NULL, ++ NULL ++}; ++ ++/* Return a newly initialized pex_obj structure. */ ++ ++struct pex_obj * ++pex_init (int flags, const char *pname, const char *tempbase) ++{ ++ return pex_init_common (flags, pname, tempbase, &funcs); ++} ++ ++/* Open a file for reading. */ ++ ++static int ++pex_tyndur_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, ++ int binary ATTRIBUTE_UNUSED) ++{ ++ return open (name, O_RDONLY); ++} ++ ++/* Open a file for writing. */ ++ ++static int ++pex_tyndur_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, ++ int binary ATTRIBUTE_UNUSED) ++{ ++ /* Note that we can't use O_EXCL here because gcc may have already ++ created the temporary file via make_temp_file. */ ++ return open (name, O_WRONLY | O_CREAT | O_TRUNC); ++} ++ ++/* Close a file. */ ++ ++static int ++pex_tyndur_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) ++{ ++ return close (fd); ++} ++ ++/* Execute a child. */ ++static long ++pex_tyndur_exec_child (struct pex_obj *obj, int flags, const char *executable, ++ char * const * argv, char * const * env, ++ int in, int out, int errdes, ++ int toclose, const char **errmsg, int *err) ++{ ++ size_t len; ++ int i; ++ long pid = 0; ++ /* TODO: We need to find some way to get the env vars to the ++ child, use the pipes and in/out/errdes. */ ++ ++ /* We are going to copy the path to the executable and all the ++ arguments into one string because there is no other possibility ++ at the moment for TYNDUR. */ ++ ++ /* Calculate the total length of the commandline. */ ++ len = strlen (executable); ++ for (i = 1; argv[i] != NULL; i++) { ++ /* Argument + space */ ++ len += strlen (argv[i]) + 1; ++ } ++ ++ /* We need a new block because of the dynamically sized array. */ ++ do { ++ char cmd[len]; ++ int pos = 0; ++ pos = strlen (executable); ++ strcpy (cmd, executable); ++ ++ for (i = 1; argv[i] != NULL; i++) { ++ cmd[pos++] = ' '; ++ strcpy (cmd + pos, argv[i]); ++ pos += strlen (argv[i]); ++ } ++ ++ /* Now that we have the command string the hard part is done. */ ++ pid = init_execute(cmd); ++ } while (0); ++ ++ if (pid == 0) { ++ *err = errno; ++ *errmsg = "pex_tyndur_exec_child"; ++ return -1; ++ } else { ++ return pid; ++ } ++} ++ ++/* Wait for a child process to complete. */ ++ ++static int ++pex_tyndur_wait (struct pex_obj *obj, long pid, int *status, ++ struct pex_time *time, int done, const char **errmsg, ++ int *err) ++{ ++ /* If we are cleaning up when the caller didn't retrieve process ++ status for some reason, encourage the process to go away. */ ++ if (done) ++ kill (pid, SIGTERM); ++ ++ /* Without wait4 or getrusage we can't get any information about ++ the resource usage. So we fill it up with zero. */ ++ if (time != NULL) ++ memset (time, 0, sizeof (struct pex_time)); ++ ++ if (waitpid (pid, status, 0) < 0) { ++ *err = errno; ++ *errmsg = "pex_tyndur_wait"; ++ return -1; ++ } ++ return 0; ++} ++ +diff -urN ../gcc-4.5.2/libgcc/config.host ../gcc-4.5.2/libgcc/config.host.new +--- ../gcc-4.5.2/libgcc/config.host 2011-01-07 18:58:35.599648002 +0100 ++++ ../gcc-4.5.2/libgcc/config.host 2011-01-07 18:58:43.229648001 +0100 +@@ -292,6 +292,8 @@ + ;; + i[34567]86-*-openbsd*) + ;; ++*-*-tyndur*) ++ ;; + i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu*) + extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" + tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm" diff --git a/scripts/build_crosstools b/scripts/build_crosstools index abd8f82..781bd70 100755 --- a/scripts/build_crosstools +++ b/scripts/build_crosstools @@ -1,4 +1,11 @@ #!/bin/bash + +# Versionen der Tools +BINUTILS_VERSION=2.21 +GCC_VERSION=4.5.2 +FPC_VERSION=2.4.0 +FASM_VERSION=1.69.09 + PREFIX=`pwd`/env TARGET=i386-pc-tyndur PATCHES=`pwd`/patches @@ -20,18 +27,21 @@ mkdir -p ${TMP}/cross-gcc/build mkdir -p ${TMP}/cross-fpc mkdir -p ${TMP}/cross-fasm +# +# Binutils +# if [ ! -f $PREFIX/bin/i386-pc-tyndur-ld ]; then -rm -rf ${TMP}/cross-binutils/binutils-2.18/ +rm -rf ${TMP}/cross-binutils/binutils-${BINUTILS_VERSION}/ cd ${TMP}/cross-binutils echo "[binutils] Herunterladen..." -[ -f binutils-2.18.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/binutils/binutils-2.18.tar.bz2 || die "Fehler beim Herunterladen.\nSiehe tmp/binutils.log für Details." +[ -f binutils-${BINUTILS_VERSION}.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.bz2 || die "Fehler beim Herunterladen.\nSiehe tmp/binutils.log für Details." echo "[binutils] Entpacken..." -tar -xjf binutils-2.18.tar.bz2 || die "Fehler beim Entpacken.\nSiehe tmp/binutils.log für Details." +tar -xjf binutils-${BINUTILS_VERSION}.tar.bz2 || die "Fehler beim Entpacken.\nSiehe tmp/binutils.log für Details." echo "[binutils] Patch anwenden..." -patch -p0 -d binutils-2.18/ < ${PATCHES}/binutils/2.18/binutils-2.18.patch >${LOGS}/binutils.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/binutils.log für Details." +patch -p0 -d binutils-${BINUTILS_VERSION}/ < ${PATCHES}/binutils/${BINUTILS_VERSION}/binutils-${BINUTILS_VERSION}.patch >${LOGS}/binutils.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/binutils.log für Details." cd build echo "[binutils] Konfigurieren..." -../binutils-2.18/configure --prefix="${PREFIX}" --with-sysroot=${PREFIX} --target=${TARGET} --disable-nls --disable-werror >>${LOGS}/binutils.log || die "Fehler beim Konfigurieren.\nSiehe tmp/binutils.log für Details." +../binutils-${BINUTILS_VERSION}/configure --prefix="${PREFIX}" --with-sysroot=${PREFIX} --target=${TARGET} --disable-nls --disable-werror >>${LOGS}/binutils.log || die "Fehler beim Konfigurieren.\nSiehe tmp/binutils.log für Details." echo "[binutils] Kompilieren..." make ${MAKEOPTS} >>${LOGS}/binutils.log 2>>${LOGS}/binutils.log || die "Fehler beim Kompilieren.\nSiehe tmp/binutils.log für Details." echo "[binutils] Installieren..." @@ -39,42 +49,99 @@ make install ${MAKEOPTS} >>${LOGS}/binutils.log 2>>${LOGS}/binutils.log || die " echo -e "[binutils] Abgeschlossen\n" fi +# +# GCC +# if [ ! -f $PREFIX/bin/i386-pc-tyndur-gcc ]; then -rm -rf ${TMP}/cross-gcc/gcc-4.2.2/ + +# HACK: Ansonsten wird libgcc nicht kompiliert +rm -f env/include/limits.h + +# Überprüfen ob libgmp >= 4.3.2 installiert +cat < libgmp-test.c +#include +#if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && (__GNU_MP_VERSION_MINOR < 3 || (__GNU_MP_VERSION_MINOR == 3 && __GNU_MP_VERSION_PATCHLEVEL < 2))) +#error unsupported version +#endif +int main(){} +EOF + +gcc libgmp-test.c -lgmp -o libgmp-test &> /dev/null +gcc_state=$? +rm -f libgmp-test libgmp-test.c +if [ $gcc_state != 0 ]; then die "Fehler: GMP Bibliothek in Version >= 4.3.2 (inklusive -dev Paket) benoetigt"; fi + +# Überprüfen ob libmpfr >= 2.4.2 installiert +cat < libmpfr-test.c +#include +#if MPFR_VERSION_MAJOR < 2 || (MPFR_VERSION_MAJOR == 2 && (MPFR_VERSION_MINOR < 4 || (MPFR_VERSION_MINOR == 4 && MPFR_VERSION_PATCHLEVEL < 2))) +#error unsupported version +#endif +int main(){} +EOF + +gcc libmpfr-test.c -lgmp -o libmpfr-test &> /dev/null +gcc_state=$? +rm -f libmpfr-test libmpfr-test.c +if [ $gcc_state != 0 ]; then die "Fehler: MPFR Bibliothek in Version >= 2.4.2 (inklusive -dev Paket) benoetigt"; fi + +# Überprüfen ob libmpc >= 0.8.1 installiert +cat < libmpc-test.c +#include +#if MPC_VERSION_MAJOR == 0 && (MPC_VERSION_MINOR < 8 || (MPC_VERSION_MINOR == 8 && MPC_VERSION_PATCHLEVEL < 1)) +#error unsupported version +#endif +int main(){} +EOF + +gcc libmpc-test.c -lgmp -o libmpc-test &> /dev/null +gcc_state=$? +rm -f libmpc-test.c libmpc-test +if [ $gcc_state != 0 ]; then die "Fehler: MPC Bibliothek in Version >= 0.8.1 (inklusive -dev Paket) benoetigt"; fi + +# GCC bauen & installieren +rm -rf ${TMP}/cross-gcc/gcc-${GCC_VERSION}/ cd ${TMP}/cross-gcc echo "[gcc] Herunterladen..." -[ -f gcc-core-4.2.2.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-core-4.2.2.tar.bz2 || die "Fehler beim Herunterladen von gcc-core.\nSiehe tmp/gcc.log für Details." -[ -f gcc-g++-4.2.2.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-g++-4.2.2.tar.bz2 || die "Fehler beim Herunterladen von gcc-g++.\nSiehe tmp/gcc.log für Details." +[ -f gcc-core-${GCC_VERSION}.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-core-${GCC_VERSION}.tar.bz2 || die "Fehler beim Herunterladen von gcc-core.\nSiehe tmp/gcc.log für Details." +[ -f gcc-g++-${GCC_VERSION}.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-g++-${GCC_VERSION}.tar.bz2 || die "Fehler beim Herunterladen von gcc-g++.\nSiehe tmp/gcc.log für Details." echo "[gcc] Entpacken..." -tar -xjf gcc-core-4.2.2.tar.bz2 -tar -xjf gcc-g++-4.2.2.tar.bz2 +tar -xjf gcc-core-${GCC_VERSION}.tar.bz2 +tar -xjf gcc-g++-${GCC_VERSION}.tar.bz2 echo "[gcc] Patch anwenden..." -patch -p0 -d gcc-4.2.2/ < ${PATCHES}/gcc/4.2.2/gcc-4.2.2.patch >${LOGS}/gcc.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/gcc.log für Details." +patch -p0 -d gcc-${GCC_VERSION}/ < ${PATCHES}/gcc/${GCC_VERSION}/gcc-${GCC_VERSION}.patch >${LOGS}/gcc.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/gcc.log für Details." cd build echo "[gcc] Konfigurieren..." -../gcc-4.2.2/configure --prefix="${PREFIX}" --target=${TARGET} --disable-nls --enable-languages=c,c++ --disable-shared --disable-libssp >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log|| die "Fehler beim Konfigurieren.\nSiehe tmp/gcc.log für Details." +../gcc-${GCC_VERSION}/configure --prefix="${PREFIX}" --target=${TARGET} --disable-nls --enable-languages=c,c++ --disable-shared --disable-libssp >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log|| die "Fehler beim Konfigurieren.\nSiehe tmp/gcc.log für Details." echo "[gcc] Kompilieren..." make all-gcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Kompilieren.\nSiehe tmp/gcc.log für Details." echo "[gcc] Installieren..." -make install-gcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Installieren.\nSiehe tmp/gcc.log für Details." +make install-gcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Installieren\nSiehe tmp/gcc.log für Details." +echo "[gcc] Kompilieren (libgcc)..." +make all-target-libgcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Kompilieren der libgcc.\nSiehe tmp/gcc.log für Details." +echo "[gcc] Installieren (libgcc)..." +make install-target-libgcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Installieren der libgcc.\nSiehe tmp/gcc.log für Details." echo -e "[gcc] Abgeschlossen\n" fi +# +# FPC +# if [ ! -f $PREFIX/bin/fpc ]; then -rm -rf ${TMP}/cross-fpc/fpc-2.4.0/ +rm -rf ${TMP}/cross-fpc/fpc-${FPC_VERSION}/ cd ${TMP}/cross-fpc echo "[fpc] Herunterladen..." # [ -f fpc-2.2.2.source.tar.gz ] || wget -q http://gd.tuwien.ac.at/languages/pascal/fpc/dist/source-2.2.2/fpc-2.2.2.source.tar.gz || exit -1 #[ -f fpc.zip ] || wget -q ftp://ftp.freepascal.org/pub/fpc/snapshot/trunk/source/fpc.zip || exit -1 -[ -f fpc-2.4.0.source.tar.gz ] || wget -q ftp://gd.tuwien.ac.at/languages/pascal/fpc/dist/2.4.0/source/fpc-2.4.0.source.tar.gz || die "Fehler beim Herunterladen.\nSiehe tmp/fpc.log für Details." +[ -f fpc-${FPC_VERSION}.source.tar.gz ] || wget -q ftp://gd.tuwien.ac.at/languages/pascal/fpc/dist/${FPC_VERSION}/source/fpc-${FPC_VERSION}.source.tar.gz || die "Fehler beim Herunterladen.\nSiehe tmp/fpc.log für Details." echo "[fpc] Entpacken..." #tar -xzf fpc-2.2.2.source.tar.gz || exit -1 #unzip -qo fpc.zip || exit -1 -tar -xzf fpc-2.4.0.source.tar.gz || die "Fehler beim Entpacken.\nSiehe tmp/fpc.log für Details." +tar -xzf fpc-${FPC_VERSION}.source.tar.gz || die "Fehler beim Entpacken.\nSiehe tmp/fpc.log für Details." echo "[fpc] Patch anwenden..." -patch -p0 < ${PATCHES}/fpc/2.4.0/fpc-2.4.0.patch >${LOGS}/fpc.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/fpc.log für Details." +patch -p0 < ${PATCHES}/fpc/${FPC_VERSION}/fpc-${FPC_VERSION}.patch >${LOGS}/fpc.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/fpc.log für Details." #echo "[fpc] fpcmake bauen" #cd fpcbuild_2.0.4_exp/fpcsrc/utils/fpcm #make >>${LOGS}/fpc.log || exit -1 @@ -82,7 +149,7 @@ patch -p0 < ${PATCHES}/fpc/2.4.0/fpc-2.4.0.patch >${LOGS}/fpc.log || die "Fehler #cd .. echo "[fpc] Erzeuge Hilfsskripte..." -cd fpc-2.4.0 +cd fpc-${FPC_VERSION} cat >> i386-linux-ld <<"EOF" #!/bin/sh @@ -108,18 +175,21 @@ cp utils/fpcm/fpcmake ${PREFIX}/bin/fpcmake echo -e "[fpc] Abgeschlossen\n" fi +# +# FASM +# if [ ! -f $PREFIX/bin/fasm ]; then rm -rf ${TMP}/cross-fasm/fasm/ cd ${TMP}/cross-fasm echo "[fasm] Herunterladen..." -[ -f fasm-1.69.09.tar.gz ] || wget -q http://flatassembler.net/fasm-1.69.09.tar.gz || die "Fehler beim Herunterladen." +[ -f fasm-${FASM_VERSION}.tar.gz ] || wget -q http://flatassembler.net/fasm-${FASM_VERSION}.tar.gz || die "Fehler beim Herunterladen." echo "[fasm] Entpacken..." -tar -xzf fasm-1.69.09.tar.gz || die "Fehler beim Entpacken." +tar -xzf fasm-${FASM_VERSION}.tar.gz || die "Fehler beim Entpacken." echo "[fasm] Linux-FASM linken..." cd fasm gcc -m32 fasm.o -o fasm || die "Fehler beim Linken des Linux-FASM." echo "[fasm] Patch anwenden..." -patch source/formats.inc ${PATCHES}/fasm/1.69.09/formats.patch || die "Fehler beim Anwenden des Patches." +patch source/formats.inc ${PATCHES}/fasm/${FASM_VERSION}/formats.patch || die "Fehler beim Anwenden des Patches." echo "[fasm] Assemblieren..." ./fasm source/libc/fasm.asm fasm.o || die "Fehler beim Assemblieren." echo "[fasm] Týndur-FASM linken..." -- 1.7.1 From toni at tyndur.org Sat Jan 8 19:39:51 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sat, 8 Jan 2011 19:39:51 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_7/7=5D_argv_=FCber_PPB_=FC?= =?iso-8859-1?q?bergeben?= In-Reply-To: <1293628353-11131-8-git-send-email-kevin@tyndur.org> References: <1293628353-11131-1-git-send-email-kevin@tyndur.org> <1293628353-11131-8-git-send-email-kevin@tyndur.org> Message-ID: <20110108183951.GH7079@neo.geekcave.lan> On Wed, Dec 29 14:12, Kevin Wolf wrote: > * libc: Die Argumente von neu gestarteten Programmen werden jetzt in > einem PPB statt in der Kommandozeile übergeben > * init: Angepasst, um Programme mit PPB starten zu können > * Pascal-RTL: argv wird jetzt aus dem PPB ausgelesen Wäre der letzte Punkt nicht eher was für einen separaten Pätsch? > > Signed-off-by: Kevin Wolf > --- > src/modules/include/init.h | 1 + > src/modules/init/init.c | 76 ++++++++++++++++++++---------------- > src/modules/init/loader.c | 7 +++- > src/modules/lib/init.c | 32 +++++++++++++-- > src/modules/lib/param.c | 16 ++++++++ > src/modules/pas/lib/prt0.asm | 17 +++++++- > src/modules/pas/lib/rtl/system.pas | 61 +++++++---------------------- > 7 files changed, 122 insertions(+), 88 deletions(-) > > diff --git a/src/modules/include/init.h b/src/modules/include/init.h > index eb29b3a..4bd3ebd 100644 > --- a/src/modules/include/init.h > +++ b/src/modules/include/init.h > @@ -44,6 +44,7 @@ char *init_service_get_name(pid_t pid); > > void init_process_exit(int result); > pid_t init_execute(const char* cmd); > +pid_t init_execv(const char* file, const char* const argv[]); > int ppb_from_argv(const char* const argv[]); > > int cmdline_get_argc(const char* args); > diff --git a/src/modules/init/init.c b/src/modules/init/init.c > index 573bccd..384b151 100644 > --- a/src/modules/init/init.c > +++ b/src/modules/init/init.c > @@ -76,8 +76,9 @@ void rpc_dev_list(pid_t pid, uint32_t cid, size_t size, void* data); > > void load_modules(init_module_list_t* modules); > pid_t load_single_module(void* image, size_t image_size, char* args, > - pid_t parent_pid) ; > -pid_t start_program(char* path, char* args, pid_t parent_pid); > + pid_t parent_pid, int ppb_shm_id); > +static pid_t start_program(const char* path, char* args, pid_t parent_pid, > + int shm); > extern void init_sync_messages(void); > > struct service_s* get_service_by_name(const char* name); > @@ -355,7 +356,7 @@ void load_modules(init_module_list_t* modules) > { > //printf("Modul %d: %s\n", i, modules->modules[i].cmdline); > load_single_module((Elf32_Ehdr*) modules->modules[i].start, > - modules->modules[i].size, modules->modules[i].cmdline, 0); > + modules->modules[i].size, modules->modules[i].cmdline, 0, 0); > mem_free(modules->modules[i].start, modules->modules[i].size); > //msleep(50); // Damit die Meldungen nicht durcheinandergeraten > } > @@ -436,7 +437,8 @@ size_t ainflate(void* src, size_t len, void** dest_ptr) > return ret; > } > > -pid_t start_program(char* path, char* args, pid_t parent_pid) > +static pid_t start_program(const char* path, char* args, pid_t parent_pid, > + int shm) > { > pid_t pid; > FILE* f = fopen(path, "r"); > @@ -479,10 +481,13 @@ pid_t start_program(char* path, char* args, pid_t parent_pid) > { > /* Skript: Interpreter aufrufen */ > char interpreter[256]; > - char* new_path; > - char* new_args; > + char* interp_args; > + int ppb_argc, interp_argc, argc; > int ret; > size_t i; > + struct proc_param_block* ppb; > + size_t ppb_size; > + int new_shm; > > fgets(interpreter, 256, f); > fclose(f); > @@ -496,14 +501,29 @@ pid_t start_program(char* path, char* args, pid_t parent_pid) > return false; > } > > - asprintf(&new_args, "%s%s%s", > - interpreter + 2, > - args ? " " : "", > - args ? args : ""); > - new_path = strtok(interpreter + 2, " "); > + interp_args = interpreter + 2; > + > + ppb = open_shared_memory(shm); > + if (ppb == NULL) { > + return false; > + } > + ppb_size = PAGE_SIZE; // FIXME Was gehoert denn hier in richtig hin? Ein shm_size-Syscall? > + > + ppb_argc = ppb_get_argc(ppb, ppb_size); > + interp_argc = cmdline_get_argc(interp_args); > + argc = ppb_argc + interp_argc; > + > + const char* argv[argc + 1]; > + > + cmdline_copy_argv(interp_args, argv, interp_argc); > + ppb_copy_argv(ppb, ppb_size, (char**) argv + interp_argc, ppb_argc); > + argv[argc] = NULL; > + > + new_shm = ppb_from_argv(argv); > + ret = start_program(argv[0], args, parent_pid, new_shm); > + close_shared_memory(new_shm); > + close_shared_memory(shm); > > - ret = start_program(new_path, new_args, parent_pid); > - free(new_args); > return ret; > } > else > @@ -514,7 +534,7 @@ pid_t start_program(char* path, char* args, pid_t parent_pid) > } > fclose(f); > > - pid = load_single_module(buffer, buffer_size, args, parent_pid); > + pid = load_single_module(buffer, buffer_size, args, parent_pid, shm); > free(buffer); > return pid; > } > @@ -522,33 +542,21 @@ pid_t start_program(char* path, char* args, pid_t parent_pid) > > void rpc_loadelf(pid_t pid, uint32_t correlation_id, size_t data_size, void* data) > { > - char* first_space; > pid_t new_pid; > + size_t fn_len; > + int shm; > > - // Wir erwarten einen Null-terminierten String > - if (strnlen(data, data_size) == data_size) { > + // Wir erwarten einen Null-terminierten String und einen Integer > + fn_len = strnlen(data, data_size); > + > + if (data_size < fn_len + sizeof(int) + 1) { > rpc_send_dword_response(pid, correlation_id, 0); > return; > } > > + shm = *(int*)((uintptr_t) data + fn_len + 1); > > - first_space = strchr(data, ' '); > - > - //Wenn kein leerschlag vorhanden ist, muessen keine Kommandozeilenargumente > - //abgetrennt werden. > - if (first_space == NULL) { > - new_pid = start_program(data, data, pid); > - } else { > - //Sonst wird erst der Name rauskopiert > - size_t filename_length = (uint32_t) first_space - (uint32_t) data; > - char* filename = malloc(filename_length + 1); > - memcpy(filename, data, filename_length); > - filename[filename_length] = '\0'; > - > - new_pid = start_program(filename, data, pid); > - > - free(filename); > - } > + new_pid = start_program(data, data, pid, shm); > rpc_send_dword_response(pid, correlation_id, new_pid); > } > > diff --git a/src/modules/init/loader.c b/src/modules/init/loader.c > index 3a5fdea..3f440ca 100644 > --- a/src/modules/init/loader.c > +++ b/src/modules/init/loader.c > @@ -99,7 +99,7 @@ bool loader_create_thread(pid_t process, vaddr_t address) > * Erstellt einen neuen Prozess aus einer ELF-Datei > */ > pid_t load_single_module(void* image, size_t image_size, char* args, > - pid_t parent_pid) > + pid_t parent_pid, int ppb_shm_id) > { > p(); > lock(&loader_state.lock); > @@ -110,6 +110,11 @@ pid_t load_single_module(void* image, size_t image_size, char* args, > loader_state.pid = 0; > goto fail; > } > + > + if (ppb_shm_id) { > + init_child_ppb(loader_state.pid, ppb_shm_id); > + } > + > unblock_process(loader_state.pid); > > fail: > diff --git a/src/modules/lib/init.c b/src/modules/lib/init.c > index ea0a7d2..2edad3e 100644 > --- a/src/modules/lib/init.c > +++ b/src/modules/lib/init.c > @@ -99,9 +99,12 @@ void init_process_exit(int result) > } > > /** > + * Startet einen neuen Prozess > * > + * @param cmd Dateiname des zu startenden Programms > + * @param ppb_shm_id ID des SHM, der den Process Parameter Block enthaelt > */ > -pid_t init_execute(const char* cmd) > +pid_t __init_exec(const char* cmd, int ppb_shm_id) > { > pid_t pid; > > @@ -161,11 +164,10 @@ pid_t init_execute(const char* cmd) > > // Ansonsten wird jetzt der ganze Befehl in einen Puffer kopiert > size_t abs_path_len = strlen(abs_path); > - size_t args_len = strlen(cmd + program_len); > - size_t rpc_size = abs_path_len + args_len + 1; > + size_t rpc_size = abs_path_len + sizeof(int) + 1; > char rpc_data[rpc_size]; > strcpy(rpc_data, abs_path); > - strcpy(rpc_data + abs_path_len, cmd + program_len); > + *(int*)(rpc_data + abs_path_len + 1) = ppb_shm_id; > free(abs_path); > > // TODO: Relative Pfade > @@ -215,6 +217,28 @@ void cmdline_copy_argv(char* args, const char** argv, size_t argc) > argv[argc] = NULL; > } > > +pid_t init_execute(const char* args) > +{ > + int argc; > + char* s; > + int ret; > + > + /* Zunaechst die Argumente zaehlen. */ > + argc = cmdline_get_argc(args); > + > + /* Jetzt argv anlegen und befuellen */ > + const char* argv[argc + 1]; > + > + s = strdup(args); > + cmdline_copy_argv(s, argv, argc); > + > + /* Und den Prozess starten */ > + ret = init_execv(args, argv); > + free(s); > + > + return ret; > +} > + > int init_dev_register(struct init_dev_desc* dev, size_t size) > { > return rpc_get_int(1, "DEV_REG ", size, (char*) dev); > diff --git a/src/modules/lib/param.c b/src/modules/lib/param.c > index c3a4f60..1267216 100644 > --- a/src/modules/lib/param.c > +++ b/src/modules/lib/param.c > @@ -193,6 +193,22 @@ int ppb_from_argv(const char* const argv[]) > return shm; > } > > +pid_t init_execv(const char* file, const char* const argv[]) > +{ > + int shm; > + pid_t ret; > + > + shm = ppb_from_argv(argv); > + if (shm == -1) { > + return -1; > + } > + > + ret = __init_exec(file, shm); > + close_shared_memory(shm); > + > + return ret; > +} > + > bool ppb_is_valid(struct proc_param_block* ppb, size_t ppb_size) > { > size_t offset; > diff --git a/src/modules/pas/lib/prt0.asm b/src/modules/pas/lib/prt0.asm > index 8aff18a..4570d62 100644 > --- a/src/modules/pas/lib/prt0.asm > +++ b/src/modules/pas/lib/prt0.asm > @@ -1,13 +1,24 @@ > ; startup > extern PASCALMAIN > -global _start > > section .text > > +global _start > _start: > + mov [__ppb_shm_id], eax > + mov [__ppb_ptr], ebx > + mov [__ppb_size], ecx > call PASCALMAIN > hlt > - > + > section .data > - > + > section .bss > + > +global __ppb_size > +global __ppb_ptr > +global __ppb_shm_id > + > +__ppb_size: resd 1 > +__ppb_ptr: resd 1 > +__ppb_shm_id: resd 1 > diff --git a/src/modules/pas/lib/rtl/system.pas b/src/modules/pas/lib/rtl/system.pas > index 92701ea..1cc5d7b 100644 > --- a/src/modules/pas/lib/rtl/system.pas > +++ b/src/modules/pas/lib/rtl/system.pas > @@ -58,6 +58,11 @@ procedure DisableFlushing(var f: Text); > > implementation > > +var > + ppb_size: integer; external name '__ppb_size'; > + ppb_ptr: Pointer; external name '__ppb_ptr'; > + ppb_shm_id: integer; external name '__ppb_shm_id'; > + > procedure InitMessaging; cdecl; external name 'init_messaging'; > procedure InitEnvironment; cdecl; external name 'init_envvars'; > procedure InitWaitpid; cdecl; external name 'init_waitpid'; > @@ -96,7 +101,7 @@ end; > { number of args } > function paramcount : longint; > begin > - paramcount := argc; > + paramcount := argc - 1; > end; > > { argument number l } > @@ -105,23 +110,7 @@ var > p: PChar; > begin > if (l >= 0) and (l <= argc) then begin > - (*paramstr := StrPas(argv[l])*) > - p := commandline; > - while (l > 0) and (p^ <> #0) do begin > - if p^ = ' ' then begin > - Dec(l); > - while (p+1)^ = ' ' do begin > - Inc(p); > - end; > - end; > - Inc(p); > - end; > - > - paramstr := ''; > - while not (p^ in [' ', #0]) do begin > - paramstr := paramstr + p^; > - Inc(p); > - end; > + paramstr := StrPas(argv[l]); > end else begin > paramstr := ''; > end; > @@ -223,41 +212,21 @@ begin > OpenStdIO(StdErr, fmOutput, StdErrorHandle); > end; > > +function ppb_get_argc(ppb: Pointer; size: integer): integer; > + cdecl; external name 'ppb_get_argc'; > +procedure ppb_copy_argv(ppb: Pointer; size: integer; argv: PPChar; argc: integer); > + cdecl; external name 'ppb_copy_argv'; > + > procedure InitParams; > var > i: integer; > p: PChar; > space: boolean; > begin > - commandline := GetCmdline(); > - > - p := commandline; > - argc := 0; > - space := false; > - while p^ <> #0 do begin > - if p^ = ' ' then begin > - space := true; > - end else if space then begin > - space := false; > - Inc(argc); > - end; > - > - Inc(p); > - end; > + argc := ppb_get_argc(ppb_ptr, ppb_size); Hier vielleicht noch etwas Fehlerbehandlung? > > - (*argv := GetMem((argc + 1) * sizeof(PChar)); > - > - p := cmdline; > - argv^ := p; > - i := 1; > - while p^ <> #0 do begin > - if p^ = ' ' then begin > - (argv + i)^ := p; > - Inc(i); > - end; > - > - Inc(p); > - end;*) > + argv := GetMem((argc + 1) * sizeof(PChar)); > + ppb_copy_argv(ppb_ptr, ppb_size, argv, argc); > end; > > Begin Weiter fällt mir auf, dass die crt0 noch den Code für ohne PPB enthält, aber prt0 nicht. Hat das irgend einen konkreten Grund? ;-) Sonst könnte das wohl etwa hinkommen, glaube ich. -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From kevin at tyndur.org Sat Jan 8 21:51:17 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 8 Jan 2011 21:51:17 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_7/7=5D_argv_=FCber_PPB_=FC?= =?iso-8859-1?q?bergeben?= In-Reply-To: <20110108183951.GH7079@neo.geekcave.lan> References: <1293628353-11131-1-git-send-email-kevin@tyndur.org> <1293628353-11131-8-git-send-email-kevin@tyndur.org> <20110108183951.GH7079@neo.geekcave.lan> Message-ID: <20110108205117.GA20476@silvanus> On Sat, Jan 08, 2011 at 07:39:51PM +0100, Antoine Kaufmann wrote: > On Wed, Dec 29 14:12, Kevin Wolf wrote: > > * libc: Die Argumente von neu gestarteten Programmen werden jetzt in > > einem PPB statt in der Kommandozeile übergeben > > * init: Angepasst, um Programme mit PPB starten zu können > > * Pascal-RTL: argv wird jetzt aus dem PPB ausgelesen > > Wäre der letzte Punkt nicht eher was für einen separaten Pätsch? Wollte ich eigentlich, aber egal wierum ich es ändere, mache ich damit die Pascal-RTL für einen Commit kaputt, weil ich mir dort nicht die Mühe mache, veralteten Code mitzuschleppen. > > @@ -496,14 +501,29 @@ pid_t start_program(char* path, char* args, pid_t parent_pid) > > return false; > > } > > > > - asprintf(&new_args, "%s%s%s", > > - interpreter + 2, > > - args ? " " : "", > > - args ? args : ""); > > - new_path = strtok(interpreter + 2, " "); > > + interp_args = interpreter + 2; > > + > > + ppb = open_shared_memory(shm); > > + if (ppb == NULL) { > > + return false; > > + } > > + ppb_size = PAGE_SIZE; // FIXME > > Was gehoert denn hier in richtig hin? Ein shm_size-Syscall? Ja, irgendwie sowas. > > @@ -223,41 +212,21 @@ begin > > OpenStdIO(StdErr, fmOutput, StdErrorHandle); > > end; > > > > +function ppb_get_argc(ppb: Pointer; size: integer): integer; > > + cdecl; external name 'ppb_get_argc'; > > +procedure ppb_copy_argv(ppb: Pointer; size: integer; argv: PPChar; argc: integer); > > + cdecl; external name 'ppb_copy_argv'; > > + > > procedure InitParams; > > var > > i: integer; > > p: PChar; > > space: boolean; > > begin > > - commandline := GetCmdline(); > > - > > - p := commandline; > > - argc := 0; > > - space := false; > > - while p^ <> #0 do begin > > - if p^ = ' ' then begin > > - space := true; > > - end else if space then begin > > - space := false; > > - Inc(argc); > > - end; > > - > > - Inc(p); > > - end; > > + argc := ppb_get_argc(ppb_ptr, ppb_size); > > Hier vielleicht noch etwas Fehlerbehandlung? Wird überbewertet. ;-) Ich bau's für die nächste Version ein. > > > > > - (*argv := GetMem((argc + 1) * sizeof(PChar)); > > - > > - p := cmdline; > > - argv^ := p; > > - i := 1; > > - while p^ <> #0 do begin > > - if p^ = ' ' then begin > > - (argv + i)^ := p; > > - Inc(i); > > - end; > > - > > - Inc(p); > > - end;*) > > + argv := GetMem((argc + 1) * sizeof(PChar)); > > + ppb_copy_argv(ppb_ptr, ppb_size, argv, argc); > > end; > > > > Begin > > Weiter fällt mir auf, dass die crt0 noch den Code für ohne PPB enthält, > aber prt0 nicht. Hat das irgend einen konkreten Grund? ;-) Jo, init kriegt vom Kernel keinen PPB, deswegen kann das in der libc nicht raus. Wobei man es vielleicht von der libc nach init verschieben könnte, das wäre wahrscheinlich sauberer. Kevin From bluecoder at gmx.de Sun Jan 9 00:32:46 2011 From: bluecoder at gmx.de (=?UTF-8?q?J=C3=B6rg=20Pf=C3=A4hler?=) Date: Sun, 9 Jan 2011 00:32:46 +0100 Subject: [tyndur-devel] [PATCH] v2 crosscompiler mit binutils 2.21 und gcc 4.5.2 Message-ID: <1294529566-21213-1-git-send-email-bluecoder@gmx.de> --- patches/binutils/2.18/binutils-2.18.patch | 357 ---------------------- patches/binutils/2.18/oldbinutils.patch | 278 ----------------- patches/binutils/2.21/binutils-2.21.patch | 336 +++++++++++++++++++++ patches/gcc/4.2.2/gcc-4.2.2.patch | 454 ---------------------------- patches/gcc/4.5.2/gcc-4.5.2.patch | 463 +++++++++++++++++++++++++++++ scripts/build_crosstools | 198 +++++++++++-- 6 files changed, 974 insertions(+), 1112 deletions(-) delete mode 100644 patches/binutils/2.18/binutils-2.18.patch delete mode 100644 patches/binutils/2.18/oldbinutils.patch create mode 100644 patches/binutils/2.21/binutils-2.21.patch delete mode 100644 patches/gcc/4.2.2/gcc-4.2.2.patch create mode 100644 patches/gcc/4.5.2/gcc-4.5.2.patch diff --git a/patches/binutils/2.18/binutils-2.18.patch b/patches/binutils/2.18/binutils-2.18.patch deleted file mode 100644 index 24157bd..0000000 --- a/patches/binutils/2.18/binutils-2.18.patch +++ /dev/null @@ -1,357 +0,0 @@ -diff -uNr ../binutils-2.18/bfd/config.bfd ./bfd/config.bfd ---- ../binutils-2.18/bfd/config.bfd 2007-08-28 19:19:33.000000000 +0200 -+++ ./bfd/config.bfd 2008-01-21 15:22:03.000000000 +0100 -@@ -575,6 +575,11 @@ - targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec" - targ64_selvecs=bfd_elf64_x86_64_vec - ;; -+ i[3-7]86-*-tyndur) -+ targ_defvec=bfd_elf32_i386_vec -+ targ_selvecs=bfd_elf32_i386_vec -+ targ64_selvecs=bfd_elf64_x86_64_vec -+ ;; - #ifdef BFD64 - x86_64-*-elf*) - targ_defvec=bfd_elf64_x86_64_vec -diff -uNr ../binutils-2.18/config.sub ./config.sub ---- ../binutils-2.18/config.sub 2007-08-06 22:00:30.000000000 +0200 -+++ ./config.sub 2008-01-21 15:22:03.000000000 +0100 -@@ -121,8 +121,8 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -+ tyndur | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | \ -+ netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -1256,6 +1256,9 @@ - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -+ -tyndur*) -+ os=-tyndur -+ ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; -diff -uNr ../binutils-2.18/gas/configure.tgt ./gas/configure.tgt ---- ../binutils-2.18/gas/configure.tgt 2007-08-28 19:19:36.000000000 +0200 -+++ ./gas/configure.tgt 2008-01-21 15:22:03.000000000 +0100 -@@ -192,6 +192,7 @@ - i386-*-linux*oldld) fmt=aout em=linux ;; - i386-*-linux*coff*) fmt=coff em=linux ;; - i386-*-linux-*) fmt=elf em=linux ;; -+ i386-*-tyndur) fmt=elf ;; - i386-*-lynxos*) fmt=elf em=lynx ;; - i386-*-sysv[45]*) fmt=elf ;; - i386-*-solaris*) fmt=elf ;; -diff -uNr ../binutils-2.18/ld/configure.tgt ./ld/configure.tgt ---- ../binutils-2.18/ld/configure.tgt 2007-08-28 19:19:42.000000000 +0200 -+++ ./ld/configure.tgt 2008-02-08 17:55:11.000000000 +0100 -@@ -201,6 +201,10 @@ - targ_extra_libpath=elf_i386 - tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; -+i[3-7]86-*-tyndur*) -+ targ_emul=elf_i386_tyndur -+ targ_extra_emuls="elf_i386" -+ ;; - i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;; - i[3-7]86-*-solaris2*) targ_emul=elf_i386_ldso - targ_extra_emuls="elf_i386 elf_x86_64" -@@ -680,6 +684,9 @@ - *-*-linux*) - ;; - -+*-*-tyndur*) -+ NATIVE_LIB_DIRS='/system/links/lib' -+ ;; - *-*-freebsd* | *-*-dragonfly*) - ;; - -diff -uNr ../binutils-2.18/ld/emulparams/elf_i386_tyndur.sh ./ld/emulparams/elf_i386_tyndur.sh ---- ../binutils-2.18/ld/emulparams/elf_i386_tyndur.sh 1970-01-01 01:00:00.000000000 +0100 -+++ ./ld/emulparams/elf_i386_tyndur.sh 2008-02-04 08:05:57.000000000 +0100 -@@ -0,0 +1,17 @@ -+SCRIPT_NAME=elf -+OUTPUT_FORMAT="elf32-i386" -+TEXT_START_ADDR=0x40000000 -+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -+ARCH=i386 -+MACHINE= -+NOP=0x90909090 -+TEMPLATE_NAME=elf32 -+GENERATE_SHLIB_SCRIPT=yes -+GENERATE_PIE_SCRIPT=yes -+NO_SMALL_DATA=yes -+SEPARATE_GOTPLT=12 -+CTOR_START="__ctor_start__ = .;" -+CTOR_END="__ctor_end__ = .;" -+DTOR_START="__dtor_start__ = .;" -+DTOR_END="__dtor_end__ = .;" -diff -uNr ../binutils-2.18/ld/Makefile.am ./ld/Makefile.am ---- ../binutils-2.18/ld/Makefile.am 2007-08-06 22:00:17.000000000 +0200 -+++ ./ld/Makefile.am 2008-02-04 08:17:43.000000000 +0100 -@@ -1001,6 +1001,9 @@ - eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" -+eelf_i386_tyndur.c: $(srcdir)/emulparams/elf_i386_tyndur.sh \ -+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -+ ${GENSCRIPTS} elf_i386_tyndur "$(tdir_elf_i386_tyndur)" - eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \ - $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -diff -uNr ../binutils-2.18/ld/Makefile.in ./ld/Makefile.in ---- ../binutils-2.18/ld/Makefile.in 2007-08-06 22:29:54.000000000 +0200 -+++ ./ld/Makefile.in 2008-02-04 08:17:13.000000000 +0100 -@@ -452,6 +452,7 @@ - eelf_i386_chaos.o \ - eelf_i386_fbsd.o \ - eelf_i386_ldso.o \ -+ eelf_i386_tyndur.o \ - eelf_i386_vxworks.o \ - eelf_s390.o \ - egld960.o \ -@@ -1827,6 +1828,10 @@ - eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" -+eelf_i386_tyndur.c: $(srcdir)/emulparams/elf_i386_tyndur.sh \ -+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -+ ${GENSCRIPTS} elf_i386_tyndur "$(tdir_elf_i386_tyndur)" -+ - eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \ - $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -diff -uNr ../binutils-2.18/libiberty/configure ./libiberty/configure ---- ../binutils-2.18/libiberty/configure 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/configure 2008-01-21 15:22:03.000000000 +0100 -@@ -8520,6 +8520,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-tyndur*) pexecute=./pex-tyndur.o ;; - *) pexecute=./pex-unix.o ;; - esac - -diff -uNr ../binutils-2.18/libiberty/configure.ac ./libiberty/configure.ac ---- ../binutils-2.18/libiberty/configure.ac 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/configure.ac 2008-01-21 15:22:03.000000000 +0100 -@@ -682,6 +682,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-tyndur*) pexecute=./pex-tyndur.o ;; - *) pexecute=./pex-unix.o ;; - esac - AC_SUBST(pexecute) -diff -uNr ../binutils-2.18/libiberty/Makefile.in ./libiberty/Makefile.in ---- ../binutils-2.18/libiberty/Makefile.in 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/Makefile.in 2008-01-21 15:22:03.000000000 +0100 -@@ -140,7 +140,7 @@ - objalloc.c obstack.c \ - partition.c pexecute.c \ - pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ -- pex-unix.c pex-win32.c \ -+ pex-unix.c pex-win32.c pex-tyndur.c \ - physmem.c putenv.c \ - random.c regex.c rename.c rindex.c \ - safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \ -@@ -857,6 +857,13 @@ - else true; fi - $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) - -+./pex-tyndur.o: $(srcdir)/pex-tyndur.c stamp-h $(INCDIR)/ansidecl.h \ -+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h -+ if [ x"$(PICFLAG)" != x ]; then \ -+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-tyndur.c -o pic/$@; \ -+ else true; fi -+ $(COMPILE.c) $(srcdir)/pex-tyndur.c $(OUTPUT_OPTION) -+ - ./pex-msdos.o: $(srcdir)/pex-msdos.c stamp-h $(INCDIR)/ansidecl.h \ - $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ - $(INCDIR)/safe-ctype.h -diff -uNr ../binutils-2.18/libiberty/pex-tyndur.c ./libiberty/pex-tyndur.c ---- ../binutils-2.18/libiberty/pex-tyndur.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./libiberty/pex-tyndur.c 2008-01-21 15:22:03.000000000 +0100 -@@ -0,0 +1,154 @@ -+/* Utilities to execute a program in a subprocess (possibly linked by pipes -+ with other subprocesses), and wait for it. Generic Unix version -+ (also used for UWIN and VMS). -+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -+ Free Software Foundation, Inc. -+ -+This file is part of the libiberty library. -+Libiberty is free software; you can redistribute it and/or -+modify it under the terms of the GNU Library General Public -+License as published by the Free Software Foundation; either -+version 2 of the License, or (at your option) any later version. -+ -+Libiberty is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+Library General Public License for more details. -+ -+You should have received a copy of the GNU Library General Public -+License along with libiberty; see the file COPYING.LIB. If not, -+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, -+Boston, MA 02110-1301, USA. */ -+ -+#include "config.h" -+#include "libiberty.h" -+#include "pex-common.h" -+ -+#include -+#include -+#include -+#include -+#ifdef NEED_DECLARATION_ERRNO -+extern int errno; -+#endif -+#ifdef HAVE_STDLIB_H -+#include -+#endif -+#ifdef HAVE_STRING_H -+#include -+#endif -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+ -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+#ifdef HAVE_SYS_WAIT_H -+#include -+#endif -+#ifdef HAVE_GETRUSAGE -+#include -+#include -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include -+#endif -+ -+ -+static int pex_tyndur_open_read (struct pex_obj *, const char *, int); -+static int pex_tyndur_open_write (struct pex_obj *, const char *, int); -+static long pex_tyndur_exec_child (struct pex_obj *, int, const char *, -+ char * const *, char * const *, -+ int, int, int, int, -+ const char **, int *); -+static int pex_tyndur_close (struct pex_obj *, int); -+static int pex_tyndur_wait (struct pex_obj *, long, int *, struct pex_time *, -+ int, const char **, int *); -+static int pex_tyndur_pipe (struct pex_obj *, int *, int); -+static FILE *pex_tyndur_fdopenr (struct pex_obj *, int, int); -+static FILE *pex_tyndur_fdopenw (struct pex_obj *, int, int); -+static void pex_tyndur_cleanup (struct pex_obj *); -+ -+/* The list of functions we pass to the common routines. */ -+ -+const struct pex_funcs funcs = -+{ -+ pex_tyndur_open_read, -+ pex_tyndur_open_write, -+ pex_tyndur_exec_child, -+ pex_tyndur_close, -+ pex_tyndur_wait, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+ -+/* Return a newly initialized pex_obj structure. */ -+ -+struct pex_obj * -+pex_init (int flags, const char *pname, const char *tempbase) -+{ -+ return pex_init_common (flags, pname, tempbase, &funcs); -+} -+ -+/* Open a file for reading. */ -+ -+static int -+pex_tyndur_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ return open (name, O_RDONLY); -+} -+ -+/* Open a file for writing. */ -+ -+static int -+pex_tyndur_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ /* Note that we can't use O_EXCL here because gcc may have already -+ created the temporary file via make_temp_file. */ -+ return open (name, O_WRONLY | O_CREAT | O_TRUNC); -+} -+ -+/* Close a file. */ -+ -+static int -+pex_tyndur_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) -+{ -+ return close (fd); -+} -+ -+/* Execute a child. */ -+static long -+pex_tyndur_exec_child (struct pex_obj *obj, int flags, const char *executable, -+ char * const * argv, char * const * env, -+ int in, int out, int errdes, -+ int toclose, const char **errmsg, int *err) -+{ -+ // FIXME -+ return -1; -+} -+ -+/* Wait for a child process to complete. */ -+ -+static int -+pex_tyndur_wait (struct pex_obj *obj, long pid, int *status, -+ struct pex_time *time, int done, const char **errmsg, -+ int *err) -+{ -+ /* If we are cleaning up when the caller didn't retrieve process -+ status for some reason, encourage the process to go away. */ -+ if (done) -+ kill (pid, SIGTERM); -+ -+ // FIXME -+ while (get_parent_pid(pid) != 0); -+ *status = 0; -+ return 0; -+} -+ ---- ../binutils-2.18/configure 2007-08-06 22:29:40.000000000 +0200 -+++ ../binutils-2.18-new/configure 2008-06-05 19:40:52.000000000 +0200 -@@ -6127,12 +6127,12 @@ - - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. -- if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -- : -- else -- MAKEINFO="$MISSING makeinfo" -- fi -+ #if ${MAKEINFO} --version \ -+ # | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ # : -+ #else -+ # MAKEINFO="$MISSING makeinfo" -+ #fi - ;; - - esac diff --git a/patches/binutils/2.18/oldbinutils.patch b/patches/binutils/2.18/oldbinutils.patch deleted file mode 100644 index 0448401..0000000 --- a/patches/binutils/2.18/oldbinutils.patch +++ /dev/null @@ -1,278 +0,0 @@ -diff -r -u -N ../binutils-2.18/bfd/config.bfd ./bfd/config.bfd ---- ../binutils-2.18/bfd/config.bfd 2007-08-28 19:19:33.000000000 +0200 -+++ ./bfd/config.bfd 2007-12-31 12:04:35.000000000 +0100 -@@ -575,6 +575,11 @@ - targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec" - targ64_selvecs=bfd_elf64_x86_64_vec - ;; -+ i[3-7]86-*-lost) -+ targ_defvec=bfd_elf32_i386_vec -+ targ_selvecs=bfd_elf32_i386_vec -+ targ64_selvecs=bfd_elf64_x86_64_vec -+ ;; - #ifdef BFD64 - x86_64-*-elf*) - targ_defvec=bfd_elf64_x86_64_vec -diff -r -u -N ../binutils-2.18/config.sub ./config.sub ---- ../binutils-2.18/config.sub 2007-08-06 22:00:30.000000000 +0200 -+++ ./config.sub 2007-12-31 12:04:46.000000000 +0100 -@@ -121,8 +121,8 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -+ lost | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | \ -+ netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -1256,6 +1256,9 @@ - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -+ -lost*) -+ os=-lost -+ ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; -diff -r -u -N ../binutils-2.18/gas/configure.tgt ./gas/configure.tgt ---- ../binutils-2.18/gas/configure.tgt 2007-08-28 19:19:36.000000000 +0200 -+++ ./gas/configure.tgt 2007-12-31 12:11:03.000000000 +0100 -@@ -192,6 +192,7 @@ - i386-*-linux*oldld) fmt=aout em=linux ;; - i386-*-linux*coff*) fmt=coff em=linux ;; - i386-*-linux-*) fmt=elf em=linux ;; -+ i386-*-lost) fmt=elf ;; - i386-*-lynxos*) fmt=elf em=lynx ;; - i386-*-sysv[45]*) fmt=elf ;; - i386-*-solaris*) fmt=elf ;; -diff -r -u -N ../binutils-2.18/ld/configure.tgt ./ld/configure.tgt ---- ../binutils-2.18/ld/configure.tgt 2007-08-28 19:19:42.000000000 +0200 -+++ ./ld/configure.tgt 2008-01-05 22:16:40.000000000 +0100 -@@ -201,6 +201,7 @@ - targ_extra_libpath=elf_i386 - tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` - tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; -+i[3-7]86-*-lost) targ_emul=elf_i386 ;; - i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;; - i[3-7]86-*-solaris2*) targ_emul=elf_i386_ldso - targ_extra_emuls="elf_i386 elf_x86_64" -@@ -680,6 +680,9 @@ - *-*-linux*) - ;; - -+*-*-lost*) -+ NATIVE_LIB_DIRS='/system/links/lib' -+ ;; - *-*-freebsd* | *-*-dragonfly*) - ;; - -Dateien ../binutils-2.18/ld/emultempl/spu_ovl.o und ./ld/emultempl/spu_ovl.o sind verschieden. -diff -r -u -N ../binutils-2.18/libiberty/configure ./libiberty/configure ---- ../binutils-2.18/libiberty/configure 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/configure 2008-01-06 12:19:47.000000000 +0100 -@@ -8520,6 +8520,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-lost*) pexecute=./pex-lost.o ;; - *) pexecute=./pex-unix.o ;; - esac - -diff -r -u -N ../binutils-2.18/libiberty/configure.ac ./libiberty/configure.ac ---- ../binutils-2.18/libiberty/configure.ac 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/configure.ac 2008-01-06 12:02:13.000000000 +0100 -@@ -682,6 +682,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-lost*) pexecute=./pex-lost.o ;; - *) pexecute=./pex-unix.o ;; - esac - AC_SUBST(pexecute) -diff -r -u -N ../binutils-2.18/libiberty/Makefile.in ./libiberty/Makefile.in ---- ../binutils-2.18/libiberty/Makefile.in 2007-08-06 21:59:45.000000000 +0200 -+++ ./libiberty/Makefile.in 2008-01-06 12:26:05.000000000 +0100 -@@ -140,7 +140,7 @@ - objalloc.c obstack.c \ - partition.c pexecute.c \ - pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ -- pex-unix.c pex-win32.c \ -+ pex-unix.c pex-win32.c pex-lost.c \ - physmem.c putenv.c \ - random.c regex.c rename.c rindex.c \ - safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \ -@@ -857,6 +857,13 @@ - else true; fi - $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) - -+./pex-lost.o: $(srcdir)/pex-lost.c stamp-h $(INCDIR)/ansidecl.h \ -+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h -+ if [ x"$(PICFLAG)" != x ]; then \ -+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-lost.c -o pic/$@; \ -+ else true; fi -+ $(COMPILE.c) $(srcdir)/pex-lost.c $(OUTPUT_OPTION) -+ - ./pex-msdos.o: $(srcdir)/pex-msdos.c stamp-h $(INCDIR)/ansidecl.h \ - $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ - $(INCDIR)/safe-ctype.h -diff -r -u -N ../binutils-2.18/libiberty/pex-lost.c ./libiberty/pex-lost.c ---- ../binutils-2.18/libiberty/pex-lost.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./libiberty/pex-lost.c 2008-01-06 12:27:33.000000000 +0100 -@@ -0,0 +1,154 @@ -+/* Utilities to execute a program in a subprocess (possibly linked by pipes -+ with other subprocesses), and wait for it. Generic Unix version -+ (also used for UWIN and VMS). -+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -+ Free Software Foundation, Inc. -+ -+This file is part of the libiberty library. -+Libiberty is free software; you can redistribute it and/or -+modify it under the terms of the GNU Library General Public -+License as published by the Free Software Foundation; either -+version 2 of the License, or (at your option) any later version. -+ -+Libiberty is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+Library General Public License for more details. -+ -+You should have received a copy of the GNU Library General Public -+License along with libiberty; see the file COPYING.LIB. If not, -+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, -+Boston, MA 02110-1301, USA. */ -+ -+#include "config.h" -+#include "libiberty.h" -+#include "pex-common.h" -+ -+#include -+#include -+#include -+#include -+#ifdef NEED_DECLARATION_ERRNO -+extern int errno; -+#endif -+#ifdef HAVE_STDLIB_H -+#include -+#endif -+#ifdef HAVE_STRING_H -+#include -+#endif -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+ -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+#ifdef HAVE_SYS_WAIT_H -+#include -+#endif -+#ifdef HAVE_GETRUSAGE -+#include -+#include -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include -+#endif -+ -+ -+static int pex_lost_open_read (struct pex_obj *, const char *, int); -+static int pex_lost_open_write (struct pex_obj *, const char *, int); -+static long pex_lost_exec_child (struct pex_obj *, int, const char *, -+ char * const *, char * const *, -+ int, int, int, int, -+ const char **, int *); -+static int pex_lost_close (struct pex_obj *, int); -+static int pex_lost_wait (struct pex_obj *, long, int *, struct pex_time *, -+ int, const char **, int *); -+static int pex_lost_pipe (struct pex_obj *, int *, int); -+static FILE *pex_lost_fdopenr (struct pex_obj *, int, int); -+static FILE *pex_lost_fdopenw (struct pex_obj *, int, int); -+static void pex_lost_cleanup (struct pex_obj *); -+ -+/* The list of functions we pass to the common routines. */ -+ -+const struct pex_funcs funcs = -+{ -+ pex_lost_open_read, -+ pex_lost_open_write, -+ pex_lost_exec_child, -+ pex_lost_close, -+ pex_lost_wait, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+ -+/* Return a newly initialized pex_obj structure. */ -+ -+struct pex_obj * -+pex_init (int flags, const char *pname, const char *tempbase) -+{ -+ return pex_init_common (flags, pname, tempbase, &funcs); -+} -+ -+/* Open a file for reading. */ -+ -+static int -+pex_lost_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ return open (name, O_RDONLY); -+} -+ -+/* Open a file for writing. */ -+ -+static int -+pex_lost_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ /* Note that we can't use O_EXCL here because gcc may have already -+ created the temporary file via make_temp_file. */ -+ return open (name, O_WRONLY | O_CREAT | O_TRUNC); -+} -+ -+/* Close a file. */ -+ -+static int -+pex_lost_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) -+{ -+ return close (fd); -+} -+ -+/* Execute a child. */ -+static long -+pex_lost_exec_child (struct pex_obj *obj, int flags, const char *executable, -+ char * const * argv, char * const * env, -+ int in, int out, int errdes, -+ int toclose, const char **errmsg, int *err) -+{ -+ // FIXME -+ return -1; -+} -+ -+/* Wait for a child process to complete. */ -+ -+static int -+pex_lost_wait (struct pex_obj *obj, long pid, int *status, -+ struct pex_time *time, int done, const char **errmsg, -+ int *err) -+{ -+ /* If we are cleaning up when the caller didn't retrieve process -+ status for some reason, encourage the process to go away. */ -+ if (done) -+ kill (pid, SIGTERM); -+ -+ // FIXME -+ while (get_parent_pid(pid) != 0); -+ *status = 0; -+ return 0; -+} -+ diff --git a/patches/binutils/2.21/binutils-2.21.patch b/patches/binutils/2.21/binutils-2.21.patch new file mode 100644 index 0000000..4e02ef3 --- /dev/null +++ b/patches/binutils/2.21/binutils-2.21.patch @@ -0,0 +1,336 @@ +diff -uNr ../binutils-2.21/bfd/config.bfd ./bfd/config.bfd +--- ../binutils-2.21/bfd/config.bfd 2007-08-28 19:19:33.000000000 +0200 ++++ ./bfd/config.bfd 2008-01-21 15:22:03.000000000 +0100 +@@ -600,6 +600,11 @@ + targ_selvecs="i386linux_vec i386pei_vec" + targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec" + ;; ++ i[3-7]86-*-tyndur) ++ targ_defvec=bfd_elf32_i386_vec ++ targ_selvecs=bfd_elf32_i386_vec ++ targ64_selvecs=bfd_elf64_x86_64_vec ++ ;; + #ifdef BFD64 + x86_64-*-darwin*) + targ_defvec=mach_o_x86_64_vec +diff -uNr ../binutils-2.21/config.sub ./config.sub +--- ../binutils-2.21/config.sub 2007-08-06 22:00:30.000000000 +0200 ++++ ./config.sub 2008-01-21 15:22:03.000000000 +0100 +@@ -127,8 +127,8 @@ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ +- kopensolaris*-gnu* | \ +- storm-chaos* | os2-emx* | rtmk-nova*) ++ tyndur | kopensolaris*-gnu* | \ ++ netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -1347,6 +1347,9 @@ + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; ++ -tyndur*) ++ os=-tyndur ++ ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; +diff -uNr ../binutils-2.21/gas/configure.tgt ./gas/configure.tgt +--- ../binutils-2.21/gas/configure.tgt 2007-08-28 19:19:36.000000000 +0200 ++++ ./gas/configure.tgt 2008-01-21 15:22:03.000000000 +0100 +@@ -199,6 +199,7 @@ + i386-*-linux*oldld) fmt=aout em=linux ;; + i386-*-linux*coff*) fmt=coff em=linux ;; + i386-*-linux-*) fmt=elf em=linux ;; ++ i386-*-tyndur) fmt=elf ;; + i386-*-lynxos*) fmt=elf em=lynx ;; + i386-*-sysv[45]*) fmt=elf ;; + i386-*-solaris*) fmt=elf em=solaris ;; +diff -uNr ../binutils-2.21/ld/configure.tgt ./ld/configure.tgt +--- ../binutils-2.21/ld/configure.tgt 2007-08-28 19:19:42.000000000 +0200 ++++ ./ld/configure.tgt 2008-02-08 17:55:11.000000000 +0100 +@@ -207,6 +207,10 @@ + targ_extra_libpath=elf_i386 + tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` + tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; ++i[3-7]86-*-tyndur*) ++ targ_emul=elf_i386_tyndur ++ targ_extra_emuls="elf_i386" ++ ;; + i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;; + i[3-7]86-*-solaris2*) targ_emul=elf_i386_sol2 + targ_extra_emuls="elf_i386_ldso elf_i386 elf_x86_64_sol2 elf_x86_64 elf_l1om" +@@ -706,6 +706,9 @@ + *-*-linux*) + ;; + ++*-*-tyndur*) ++ NATIVE_LIB_DIRS='/system/links/lib' ++ ;; + *-*-freebsd* | *-*-dragonfly*) + ;; + +diff -uNr ../binutils-2.21/ld/emulparams/elf_i386_tyndur.sh ./ld/emulparams/elf_i386_tyndur.sh +--- ../binutils-2.21/ld/emulparams/elf_i386_tyndur.sh 1970-01-01 01:00:00.000000000 +0100 ++++ ./ld/emulparams/elf_i386_tyndur.sh 2008-02-04 08:05:57.000000000 +0100 +@@ -0,0 +1,17 @@ ++SCRIPT_NAME=elf ++OUTPUT_FORMAT="elf32-i386" ++TEXT_START_ADDR=0x40000000 ++MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ++COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ++ARCH=i386 ++MACHINE= ++NOP=0x90909090 ++TEMPLATE_NAME=elf32 ++GENERATE_SHLIB_SCRIPT=yes ++GENERATE_PIE_SCRIPT=yes ++NO_SMALL_DATA=yes ++SEPARATE_GOTPLT=12 ++CTOR_START="__ctor_start__ = .;" ++CTOR_END="__ctor_end__ = .;" ++DTOR_START="__dtor_start__ = .;" ++DTOR_END="__dtor_end__ = .;" +diff -uNr ../binutils-2.21/ld/Makefile.am ./ld/Makefile.am +--- ../binutils-2.21/ld/Makefile.am 2007-08-06 22:00:17.000000000 +0200 ++++ ./ld/Makefile.am 2008-02-04 08:17:43.000000000 +0100 +@@ -1196,6 +1196,9 @@ + eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ + $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" ++eelf_i386_tyndur.c: $(srcdir)/emulparams/elf_i386_tyndur.sh \ ++ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ++ ${GENSCRIPTS} elf_i386_tyndur "$(tdir_elf_i386_tyndur)" + eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \ + $(srcdir)/emulparams/solaris2.sh \ + $(srcdir)/emultempl/solaris2.em \ +diff -uNr ../binutils-2.21/ld/Makefile.in ./ld/Makefile.in +--- ../binutils-2.21/ld/Makefile.in 2007-08-06 22:29:54.000000000 +0200 ++++ ./ld/Makefile.in 2008-02-04 08:17:13.000000000 +0100 +@@ -538,6 +538,7 @@ + eelf_i386_chaos.c \ + eelf_i386_fbsd.c \ + eelf_i386_ldso.c \ ++ eelf_i386_tyndur.o \ + eelf_i386_sol2.c \ + eelf_i386_vxworks.c \ + eelf_s390.c \ +@@ -2619,6 +2619,10 @@ + eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ + $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" ++eelf_i386_tyndur.c: $(srcdir)/emulparams/elf_i386_tyndur.sh \ ++ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ++ ${GENSCRIPTS} elf_i386_tyndur "$(tdir_elf_i386_tyndur)" ++ + eelf_i386_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \ + $(srcdir)/emulparams/solaris2.sh \ + $(srcdir)/emultempl/solaris2.em \ +diff -uNr ../binutils-2.21/libiberty/configure ./libiberty/configure +--- ../binutils-2.21/libiberty/configure 2007-08-06 21:59:45.000000000 +0200 ++++ ./libiberty/configure 2008-01-21 15:22:03.000000000 +0100 +@@ -6579,6 +6579,7 @@ + *-*-mingw* | *-*-winnt*) pexecute=pex-win32 ;; + *-*-msdosdjgpp*) pexecute=pex-djgpp ;; + *-*-msdos*) pexecute=pex-msdos ;; ++ *-*-tyndur*) pexecute=./pex-tyndur.o ;; + *) pexecute=pex-unix ;; + esac + +diff -uNr ../binutils-2.21/libiberty/configure.ac ./libiberty/configure.ac +--- ../binutils-2.21/libiberty/configure.ac 2007-08-06 21:59:45.000000000 +0200 ++++ ./libiberty/configure.ac 2008-01-21 15:22:03.000000000 +0100 +@@ -689,6 +689,7 @@ + *-*-mingw* | *-*-winnt*) pexecute=pex-win32 ;; + *-*-msdosdjgpp*) pexecute=pex-djgpp ;; + *-*-msdos*) pexecute=pex-msdos ;; ++ *-*-tyndur*) pexecute=./pex-tyndur.o ;; + *) pexecute=pex-unix ;; + esac + AC_SUBST(pexecute) +diff -uNr ../binutils-2.21/libiberty/Makefile.in ./libiberty/Makefile.in +--- ../binutils-2.21/libiberty/Makefile.in 2007-08-06 21:59:45.000000000 +0200 ++++ ./libiberty/Makefile.in 2008-01-21 15:22:03.000000000 +0100 +@@ -141,7 +141,7 @@ + objalloc.c obstack.c \ + partition.c pexecute.c \ + pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ +- pex-unix.c pex-win32.c \ ++ pex-unix.c pex-win32.c pex-tyndur.c \ + physmem.c putenv.c \ + random.c regex.c rename.c rindex.c \ + safe-ctype.c setenv.c setproctitle.c sha1.c sigsetmask.c \ +@@ -866,6 +866,13 @@ + else true; fi + $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) + ++./pex-tyndur.o: $(srcdir)/pex-tyndur.c stamp-h $(INCDIR)/ansidecl.h \ ++ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h ++ if [ x"$(PICFLAG)" != x ]; then \ ++ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-tyndur.c -o pic/$@; \ ++ else true; fi ++ $(COMPILE.c) $(srcdir)/pex-tyndur.c $(OUTPUT_OPTION) ++ + ./pex-msdos.$(objext): $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ + $(INCDIR)/safe-ctype.h +diff -uNr ../binutils-2.21/libiberty/pex-tyndur.c ./libiberty/pex-tyndur.c +--- ../binutils-2.21/libiberty/pex-tyndur.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./libiberty/pex-tyndur.c 2008-01-21 15:22:03.000000000 +0100 +@@ -0,0 +1,154 @@ ++/* Utilities to execute a program in a subprocess (possibly linked by pipes ++ with other subprocesses), and wait for it. Generic Unix version ++ (also used for UWIN and VMS). ++ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ++ Free Software Foundation, Inc. ++ ++This file is part of the libiberty library. ++Libiberty is free software; you can redistribute it and/or ++modify it under the terms of the GNU Library General Public ++License as published by the Free Software Foundation; either ++version 2 of the License, or (at your option) any later version. ++ ++Libiberty is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++Library General Public License for more details. ++ ++You should have received a copy of the GNU Library General Public ++License along with libiberty; see the file COPYING.LIB. If not, ++write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, ++Boston, MA 02110-1301, USA. */ ++ ++#include "config.h" ++#include "libiberty.h" ++#include "pex-common.h" ++ ++#include ++#include ++#include ++#include ++#ifdef NEED_DECLARATION_ERRNO ++extern int errno; ++#endif ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++#ifdef HAVE_STRING_H ++#include ++#endif ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++ ++#include ++ ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++#ifdef HAVE_SYS_WAIT_H ++#include ++#endif ++#ifdef HAVE_GETRUSAGE ++#include ++#include ++#endif ++#ifdef HAVE_SYS_STAT_H ++#include ++#endif ++ ++ ++static int pex_tyndur_open_read (struct pex_obj *, const char *, int); ++static int pex_tyndur_open_write (struct pex_obj *, const char *, int); ++static long pex_tyndur_exec_child (struct pex_obj *, int, const char *, ++ char * const *, char * const *, ++ int, int, int, int, ++ const char **, int *); ++static int pex_tyndur_close (struct pex_obj *, int); ++static int pex_tyndur_wait (struct pex_obj *, long, int *, struct pex_time *, ++ int, const char **, int *); ++static int pex_tyndur_pipe (struct pex_obj *, int *, int); ++static FILE *pex_tyndur_fdopenr (struct pex_obj *, int, int); ++static FILE *pex_tyndur_fdopenw (struct pex_obj *, int, int); ++static void pex_tyndur_cleanup (struct pex_obj *); ++ ++/* The list of functions we pass to the common routines. */ ++ ++const struct pex_funcs funcs = ++{ ++ pex_tyndur_open_read, ++ pex_tyndur_open_write, ++ pex_tyndur_exec_child, ++ pex_tyndur_close, ++ pex_tyndur_wait, ++ NULL, ++ NULL, ++ NULL, ++ NULL ++}; ++ ++/* Return a newly initialized pex_obj structure. */ ++ ++struct pex_obj * ++pex_init (int flags, const char *pname, const char *tempbase) ++{ ++ return pex_init_common (flags, pname, tempbase, &funcs); ++} ++ ++/* Open a file for reading. */ ++ ++static int ++pex_tyndur_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, ++ int binary ATTRIBUTE_UNUSED) ++{ ++ return open (name, O_RDONLY); ++} ++ ++/* Open a file for writing. */ ++ ++static int ++pex_tyndur_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, ++ int binary ATTRIBUTE_UNUSED) ++{ ++ /* Note that we can't use O_EXCL here because gcc may have already ++ created the temporary file via make_temp_file. */ ++ return open (name, O_WRONLY | O_CREAT | O_TRUNC); ++} ++ ++/* Close a file. */ ++ ++static int ++pex_tyndur_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) ++{ ++ return close (fd); ++} ++ ++/* Execute a child. */ ++static long ++pex_tyndur_exec_child (struct pex_obj *obj, int flags, const char *executable, ++ char * const * argv, char * const * env, ++ int in, int out, int errdes, ++ int toclose, const char **errmsg, int *err) ++{ ++ // FIXME ++ return -1; ++} ++ ++/* Wait for a child process to complete. */ ++ ++static int ++pex_tyndur_wait (struct pex_obj *obj, long pid, int *status, ++ struct pex_time *time, int done, const char **errmsg, ++ int *err) ++{ ++ /* If we are cleaning up when the caller didn't retrieve process ++ status for some reason, encourage the process to go away. */ ++ if (done) ++ kill (pid, SIGTERM); ++ ++ // FIXME ++ while (get_parent_pid(pid) != 0); ++ *status = 0; ++ return 0; ++} ++ diff --git a/patches/gcc/4.2.2/gcc-4.2.2.patch b/patches/gcc/4.2.2/gcc-4.2.2.patch deleted file mode 100644 index 94a337a..0000000 --- a/patches/gcc/4.2.2/gcc-4.2.2.patch +++ /dev/null @@ -1,454 +0,0 @@ -diff -urN ../gcc-4.2.2/config.sub ./config.sub ---- ../gcc-4.2.2/config.sub 2006-10-16 05:27:17.000000000 +0200 -+++ ./config.sub 2008-01-27 09:42:49.000000000 +0100 -@@ -121,8 +121,8 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -- storm-chaos* | os2-emx* | rtmk-nova*) -+ tyndur* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | \ -+ netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -1249,6 +1249,9 @@ - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -+ -tyndur*) -+ os=-tyndur -+ ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; -diff -urN ../gcc-4.2.2/gcc/config/i386/tyndur.h ./gcc/config/i386/tyndur.h ---- ../gcc-4.2.2/gcc/config/i386/tyndur.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./gcc/config/i386/tyndur.h 2008-01-27 09:42:49.000000000 +0100 -@@ -0,0 +1,56 @@ -+/* Definitions for Intel 386 running Linux-based GNU systems with ELF format. -+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2005, -+ 2006, 2007 Free Software Foundation, Inc. -+ Contributed by Eric Youngdale. -+ Modified for stabs-in-ELF by H.J. Lu. -+ Adapted from linux.h by Antoine Kaufmann -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+/* Output at beginning of assembler file. */ -+/* The .file command should always begin the output. */ -+#define TARGET_ASM_FILE_START_FILE_DIRECTIVE true -+ -+#define TARGET_VERSION fprintf (stderr, " (i386 TYNDUR/ELF)"); -+ -+/* The svr4 ABI for the i386 says that records and unions are returned -+ in memory. */ -+#undef DEFAULT_PCC_STRUCT_RETURN -+#define DEFAULT_PCC_STRUCT_RETURN 1 -+ -+#undef ASM_COMMENT_START -+#define ASM_COMMENT_START "#" -+ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "long int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE BITS_PER_WORD -+ -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ TYNDUR_TARGET_OS_CPP_BUILTINS(); \ -+ } \ -+ while (0) -+ -diff -urN ../gcc-4.2.2/gcc/config/tyndur.h ./gcc/config/tyndur.h ---- ../gcc-4.2.2/gcc/config/tyndur.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./gcc/config/tyndur.h 2008-02-10 17:17:37.000000000 +0100 -@@ -0,0 +1,59 @@ -+/* Definitions for Linux-based GNU systems with ELF format -+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2006, -+ 2007 Free Software Foundation, Inc. -+ Contributed by Eric Youngdale. -+ Modified for stabs-in-ELF by H.J. Lu (hjl at lucon.org). -+ Adapted from linux.h by Antoine Kaufmann -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+/* Don't assume anything about the header files. */ -+#define NO_IMPLICIT_EXTERN_C -+ -+/* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add -+ the GNU/Linux magical crtbegin.o file (see crtstuff.c) which -+ provides part of the support for getting C++ file-scope static -+ object constructed before entering `main'. */ -+ -+#undef STARTFILE_SPEC -+#define STARTFILE_SPEC \ -+ "crtbegin.o%s -l:crttyndur.o" -+ -+/* Provide a ENDFILE_SPEC appropriate for GNU/Linux. Here we tack on -+ the GNU/Linux magical crtend.o file (see crtstuff.c) which -+ provides part of the support for getting C++ file-scope static -+ object constructed before entering `main', followed by a normal -+ GNU/Linux "finalizer" file, `crtn.o'. */ -+ -+#undef ENDFILE_SPEC -+#define ENDFILE_SPEC \ -+ "crtend.o%s" -+ -+#define TYNDUR_TARGET_OS_CPP_BUILTINS() \ -+ do { \ -+ builtin_define ("__TYNDUR__"); \ -+ builtin_define_std ("TYNDUR"); \ -+ builtin_assert ("system=TYNDUR"); \ -+ } while (0) -+ -+#define LINK_GCC_C_SEQUENCE_SPEC \ -+ "--start-group %G %L --end-group" -+ -+#undef LINK_SPEC -+#define LINK_SPEC " %D %{shared:-shared}" -+ -+ -diff -urN ../gcc-4.2.2/gcc/config/t-tyndur ./gcc/config/t-tyndur ---- ../gcc-4.2.2/gcc/config/t-tyndur 1970-01-01 01:00:00.000000000 +0100 -+++ ./gcc/config/t-tyndur 2008-02-07 23:15:57.000000000 +0100 -@@ -0,0 +1,9 @@ -+# Compile crtbeginS.o and crtendS.o with pic. -+CRTSTUFF_T_CFLAGS_S = -fPIC -+ -+# Compile libgcc.a with pic. -+TARGET_LIBGCC2_CFLAGS += -fPIC -+ -+SYSTEM_HEADER_DIR = $(prefix)/system/links/include -+CROSS_SYSTEM_HEADER_DIR = $(prefix)/system/links/include -+inhibit_libc='true' -diff -urN ../gcc-4.2.2/gcc/config.gcc ./gcc/config.gcc ---- ../gcc-4.2.2/gcc/config.gcc 2007-09-01 17:28:30.000000000 +0200 -+++ ./gcc/config.gcc 2008-02-03 14:38:18.000000000 +0100 -@@ -500,6 +500,13 @@ - # Assume that glibc is being used and so __cxa_atexit is provided. - default_use_cxa_atexit=yes - ;; -+*-*-tyndur*) -+ gas=yes -+ gnu_ld=yes -+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" -+ tmake_file="t-slibgcc-elf-ver t-tyndur" -+ ;; -+ - *-*-netbsd*) - tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic" - gas=yes -@@ -1116,6 +1123,12 @@ - gnu_ld=yes - gas=yes - ;; -+i[34567]86-*-tyndur*) -+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h tyndur.h \ -+ i386/tyndur.h" -+ tmake_file="i386/t-i386elf i386/t-crtstuff t-tyndur" -+ ;; -+ - i[34567]86-*-lynxos*) - xm_defines=POSIX - tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/lynx.h lynx.h" -diff -urN ../gcc-4.2.2/gcc/c-opts.c ./gcc/c-opts.c ---- ../gcc-4.2.2/gcc/c-opts.c 2007-09-01 17:28:30.000000000 +0200 -+++ ./gcc/c-opts.c 2008-01-27 09:42:49.000000000 +0100 -@@ -326,7 +326,7 @@ - error ("-I- specified twice"); - quote_chain_split = true; - split_quote_chain (); -- inform ("obsolete option -I- used, please use -iquote instead"); -+ // inform ("obsolete option -I- used, please use -iquote instead"); - } - break; - -diff -urN ../gcc-4.2.2/libiberty/configure ./libiberty/configure ---- ../gcc-4.2.2/libiberty/configure 2006-08-30 15:46:50.000000000 +0200 -+++ ./libiberty/configure 2008-01-27 09:42:50.000000000 +0100 -@@ -8403,6 +8403,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-tyndur*) pexecute=./pex-tyndur.o ;; - *) pexecute=./pex-unix.o ;; - esac - -diff -urN ../gcc-4.2.2/libiberty/configure.ac ./libiberty/configure.ac ---- ../gcc-4.2.2/libiberty/configure.ac 2006-08-30 15:46:50.000000000 +0200 -+++ ./libiberty/configure.ac 2008-01-27 09:42:50.000000000 +0100 -@@ -663,6 +663,7 @@ - *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; - *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; - *-*-msdos*) pexecute=./pex-msdos.o ;; -+ *-*-tyndur*) pexecute=./pex-tyndur.o ;; - *) pexecute=./pex-unix.o ;; - esac - AC_SUBST(pexecute) -diff -urN ../gcc-4.2.2/libiberty/Makefile.in ./libiberty/Makefile.in ---- ../gcc-4.2.2/libiberty/Makefile.in 2007-03-03 20:29:51.000000000 +0100 -+++ ./libiberty/Makefile.in 2008-01-27 09:42:50.000000000 +0100 -@@ -145,7 +145,7 @@ - objalloc.c obstack.c \ - partition.c pexecute.c \ - pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ -- pex-unix.c pex-win32.c \ -+ pex-unix.c pex-win32.c pex-tyndur.c \ - physmem.c putenv.c \ - random.c regex.c rename.c rindex.c \ - safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \ -@@ -843,6 +843,13 @@ - else true; fi - $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) - -+./pex-tyndur.o: $(srcdir)/pex-tyndur.c config.h $(INCDIR)/ansidecl.h \ -+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h -+ if [ x"$(PICFLAG)" != x ]; then \ -+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-tyndur.c -o pic/$@; \ -+ else true; fi -+ $(COMPILE.c) $(srcdir)/pex-tyndur.c $(OUTPUT_OPTION) -+ - ./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ - $(INCDIR)/safe-ctype.h -diff -urN ../gcc-4.2.2/libiberty/pex-tyndur.c ./libiberty/pex-tyndur.c ---- ../gcc-4.2.2/libiberty/pex-tyndur.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./libiberty/pex-tyndur.c 2008-02-10 16:39:24.000000000 +0100 -@@ -0,0 +1,200 @@ -+/* Utilities to execute a program in a subprocess (possibly linked by pipes -+ with other subprocesses), and wait for it. Generic Unix version -+ (also used for UWIN and VMS). -+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -+ Free Software Foundation, Inc. -+ -+This file is part of the libiberty library. -+Libiberty is free software; you can redistribute it and/or -+modify it under the terms of the GNU Library General Public -+License as published by the Free Software Foundation; either -+version 2 of the License, or (at your option) any later version. -+ -+Libiberty is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+Library General Public License for more details. -+ -+You should have received a copy of the GNU Library General Public -+License along with libiberty; see the file COPYING.LIB. If not, -+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, -+Boston, MA 02110-1301, USA. */ -+ -+#include "config.h" -+#include "libiberty.h" -+#include "pex-common.h" -+ -+#include -+#include -+#include -+#include -+#ifdef NEED_DECLARATION_ERRNO -+extern int errno; -+#endif -+#ifdef HAVE_STDLIB_H -+#include -+#endif -+#ifdef HAVE_STRING_H -+#include -+#endif -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+ -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+#ifdef HAVE_SYS_WAIT_H -+#include -+#endif -+#ifdef HAVE_GETRUSAGE -+#include -+#include -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include -+#endif -+ -+ -+static int pex_tyndur_open_read (struct pex_obj *, const char *, int); -+static int pex_tyndur_open_write (struct pex_obj *, const char *, int); -+static long pex_tyndur_exec_child (struct pex_obj *, int, const char *, -+ char * const *, char * const *, -+ int, int, int, int, -+ const char **, int *); -+static int pex_tyndur_close (struct pex_obj *, int); -+static int pex_tyndur_wait (struct pex_obj *, long, int *, struct pex_time *, -+ int, const char **, int *); -+static int pex_tyndur_pipe (struct pex_obj *, int *, int); -+static FILE *pex_tyndur_fdopenr (struct pex_obj *, int, int); -+static FILE *pex_tyndur_fdopenw (struct pex_obj *, int, int); -+static void pex_tyndur_cleanup (struct pex_obj *); -+ -+/* The list of functions we pass to the common routines. */ -+ -+const struct pex_funcs funcs = -+{ -+ pex_tyndur_open_read, -+ pex_tyndur_open_write, -+ pex_tyndur_exec_child, -+ pex_tyndur_close, -+ pex_tyndur_wait, -+ NULL, -+ NULL, -+ NULL, -+ NULL -+}; -+ -+/* Return a newly initialized pex_obj structure. */ -+ -+struct pex_obj * -+pex_init (int flags, const char *pname, const char *tempbase) -+{ -+ return pex_init_common (flags, pname, tempbase, &funcs); -+} -+ -+/* Open a file for reading. */ -+ -+static int -+pex_tyndur_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ return open (name, O_RDONLY); -+} -+ -+/* Open a file for writing. */ -+ -+static int -+pex_tyndur_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, -+ int binary ATTRIBUTE_UNUSED) -+{ -+ /* Note that we can't use O_EXCL here because gcc may have already -+ created the temporary file via make_temp_file. */ -+ return open (name, O_WRONLY | O_CREAT | O_TRUNC); -+} -+ -+/* Close a file. */ -+ -+static int -+pex_tyndur_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) -+{ -+ return close (fd); -+} -+ -+/* Execute a child. */ -+static long -+pex_tyndur_exec_child (struct pex_obj *obj, int flags, const char *executable, -+ char * const * argv, char * const * env, -+ int in, int out, int errdes, -+ int toclose, const char **errmsg, int *err) -+{ -+ size_t len; -+ int i; -+ long pid = 0; -+ /* TODO: We need to find some way to get the env vars to the -+ child, use the pipes and in/out/errdes. */ -+ -+ /* We are going to copy the path to the executable and all the -+ arguments into one string because there is no other possibility -+ at the moment for TYNDUR. */ -+ -+ /* Calculate the total length of the commandline. */ -+ len = strlen (executable); -+ for (i = 1; argv[i] != NULL; i++) { -+ /* Argument + space */ -+ len += strlen (argv[i]) + 1; -+ } -+ -+ /* We need a new block because of the dynamically sized array. */ -+ do { -+ char cmd[len]; -+ int pos = 0; -+ pos = strlen (executable); -+ strcpy (cmd, executable); -+ -+ for (i = 1; argv[i] != NULL; i++) { -+ cmd[pos++] = ' '; -+ strcpy (cmd + pos, argv[i]); -+ pos += strlen (argv[i]); -+ } -+ -+ /* Now that we have the command string the hard part is done. */ -+ pid = init_execute(cmd); -+ } while (0); -+ -+ if (pid == 0) { -+ *err = errno; -+ *errmsg = "pex_tyndur_exec_child"; -+ return -1; -+ } else { -+ return pid; -+ } -+} -+ -+/* Wait for a child process to complete. */ -+ -+static int -+pex_tyndur_wait (struct pex_obj *obj, long pid, int *status, -+ struct pex_time *time, int done, const char **errmsg, -+ int *err) -+{ -+ /* If we are cleaning up when the caller didn't retrieve process -+ status for some reason, encourage the process to go away. */ -+ if (done) -+ kill (pid, SIGTERM); -+ -+ /* Without wait4 or getrusage we can't get any information about -+ the resource usage. So we fill it up with zero. */ -+ if (time != NULL) -+ memset (time, 0, sizeof (struct pex_time)); -+ -+ if (waitpid (pid, status, 0) < 0) { -+ *err = errno; -+ *errmsg = "pex_tyndur_wait"; -+ return -1; -+ } -+ return 0; -+} -+ diff --git a/patches/gcc/4.5.2/gcc-4.5.2.patch b/patches/gcc/4.5.2/gcc-4.5.2.patch new file mode 100644 index 0000000..5053246 --- /dev/null +++ b/patches/gcc/4.5.2/gcc-4.5.2.patch @@ -0,0 +1,463 @@ +diff -urN ../gcc-4.5.2/config.sub ./config.sub +--- ../gcc-4.5.2/config.sub 2006-10-16 05:27:17.000000000 +0200 ++++ ./config.sub 2008-01-27 09:42:49.000000000 +0100 +@@ -127,7 +127,7 @@ + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ +- storm-chaos* | os2-emx* | rtmk-nova*) ++ tyndur* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -1345,6 +1345,9 @@ + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; ++ -tyndur*) ++ os=-tyndur ++ ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; +diff -urN ../gcc-4.5.2/gcc/config/i386/tyndur.h ./gcc/config/i386/tyndur.h +--- ../gcc-4.5.2/gcc/config/i386/tyndur.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./gcc/config/i386/tyndur.h 2008-01-27 09:42:49.000000000 +0100 +@@ -0,0 +1,56 @@ ++/* Definitions for Intel 386 running Linux-based GNU systems with ELF format. ++ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2005, ++ 2006, 2007 Free Software Foundation, Inc. ++ Contributed by Eric Youngdale. ++ Modified for stabs-in-ELF by H.J. Lu. ++ Adapted from linux.h by Antoine Kaufmann ++ ++This file is part of GCC. ++ ++GCC is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 3, or (at your option) ++any later version. ++ ++GCC is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with GCC; see the file COPYING3. If not see ++. */ ++ ++/* Output at beginning of assembler file. */ ++/* The .file command should always begin the output. */ ++#define TARGET_ASM_FILE_START_FILE_DIRECTIVE true ++ ++#define TARGET_VERSION fprintf (stderr, " (i386 TYNDUR/ELF)"); ++ ++/* The svr4 ABI for the i386 says that records and unions are returned ++ in memory. */ ++#undef DEFAULT_PCC_STRUCT_RETURN ++#define DEFAULT_PCC_STRUCT_RETURN 1 ++ ++#undef ASM_COMMENT_START ++#define ASM_COMMENT_START "#" ++ ++#undef SIZE_TYPE ++#define SIZE_TYPE "unsigned int" ++ ++#undef PTRDIFF_TYPE ++#define PTRDIFF_TYPE "int" ++ ++#undef WCHAR_TYPE ++#define WCHAR_TYPE "long int" ++ ++#undef WCHAR_TYPE_SIZE ++#define WCHAR_TYPE_SIZE BITS_PER_WORD ++ ++#define TARGET_OS_CPP_BUILTINS() \ ++ do \ ++ { \ ++ TYNDUR_TARGET_OS_CPP_BUILTINS(); \ ++ } \ ++ while (0) ++ +diff -urN ../gcc-4.5.2/gcc/config/tyndur.h ./gcc/config/tyndur.h +--- ../gcc-4.5.2/gcc/config/tyndur.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./gcc/config/tyndur.h 2008-02-10 17:17:37.000000000 +0100 +@@ -0,0 +1,59 @@ ++/* Definitions for Linux-based GNU systems with ELF format ++ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2006, ++ 2007 Free Software Foundation, Inc. ++ Contributed by Eric Youngdale. ++ Modified for stabs-in-ELF by H.J. Lu (hjl at lucon.org). ++ Adapted from linux.h by Antoine Kaufmann ++ ++This file is part of GCC. ++ ++GCC is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 3, or (at your option) ++any later version. ++ ++GCC is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with GCC; see the file COPYING3. If not see ++. */ ++ ++/* Don't assume anything about the header files. */ ++#define NO_IMPLICIT_EXTERN_C ++ ++/* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add ++ the GNU/Linux magical crtbegin.o file (see crtstuff.c) which ++ provides part of the support for getting C++ file-scope static ++ object constructed before entering `main'. */ ++ ++#undef STARTFILE_SPEC ++#define STARTFILE_SPEC \ ++ "crtbegin.o%s -l:crttyndur.o" ++ ++/* Provide a ENDFILE_SPEC appropriate for GNU/Linux. Here we tack on ++ the GNU/Linux magical crtend.o file (see crtstuff.c) which ++ provides part of the support for getting C++ file-scope static ++ object constructed before entering `main', followed by a normal ++ GNU/Linux "finalizer" file, `crtn.o'. */ ++ ++#undef ENDFILE_SPEC ++#define ENDFILE_SPEC \ ++ "crtend.o%s" ++ ++#define TYNDUR_TARGET_OS_CPP_BUILTINS() \ ++ do { \ ++ builtin_define ("__TYNDUR__"); \ ++ builtin_define_std ("TYNDUR"); \ ++ builtin_assert ("system=TYNDUR"); \ ++ } while (0) ++ ++#define LINK_GCC_C_SEQUENCE_SPEC \ ++ "--start-group %G %L --end-group" ++ ++#undef LINK_SPEC ++#define LINK_SPEC " %D %{shared:-shared}" ++ ++ +diff -urN ../gcc-4.5.2/gcc/config/t-tyndur ./gcc/config/t-tyndur +--- ../gcc-4.5.2/gcc/config/t-tyndur 1970-01-01 01:00:00.000000000 +0100 ++++ ./gcc/config/t-tyndur 2008-02-07 23:15:57.000000000 +0100 +@@ -0,0 +1,9 @@ ++# Compile crtbeginS.o and crtendS.o with pic. ++CRTSTUFF_T_CFLAGS_S = -fPIC ++ ++# Compile libgcc.a with pic. ++TARGET_LIBGCC2_CFLAGS += -fPIC ++ ++SYSTEM_HEADER_DIR = $(prefix)/system/links/include ++CROSS_SYSTEM_HEADER_DIR = $(prefix)/system/links/include ++inhibit_libc='true' +diff -urN ../gcc-4.5.2/gcc/config.gcc ./gcc/config.gcc +--- ../gcc-4.5.2/gcc/config.gcc 2007-09-01 17:28:30.000000000 +0200 ++++ ./gcc/config.gcc 2008-02-03 14:38:18.000000000 +0100 +@@ -534,6 +534,12 @@ + use_gcc_tgmath=no + use_gcc_stdint=wrap + ;; ++*-*-tyndur*) ++ gas=yes ++ gnu_ld=yes ++ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" ++ tmake_file="t-slibgcc-elf-ver t-tyndur" ++ ;; + *-*-netbsd*) + tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic" + gas=yes +@@ -1198,6 +1198,12 @@ + gas=yes + use_gcc_stdint=wrap + ;; ++i[34567]86-*-tyndur*) ++ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h tyndur.h \ ++ i386/tyndur.h" ++ tmake_file="i386/t-i386elf i386/t-crtstuff t-tyndur" ++ ;; ++ + i[34567]86-*-lynxos*) + xm_defines=POSIX + tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/lynx.h lynx.h" +diff -urN ../gcc-4.5.2/gcc/c-opts.c ./gcc/c-opts.c +--- ../gcc-4.5.2/gcc/c-opts.c 2007-09-01 17:28:30.000000000 +0200 ++++ ./gcc/c-opts.c 2008-01-27 09:42:49.000000000 +0100 +@@ -326,7 +326,7 @@ + error ("-I- specified twice"); + quote_chain_split = true; + split_quote_chain (); +- inform (input_location, "obsolete option -I- used, please use -iquote instead"); ++ // inform (input_location, "obsolete option -I- used, please use -iquote instead"); + } + break; + +diff -urN ../gcc-4.5.2/libiberty/configure ./libiberty/configure +--- ../gcc-4.5.2/libiberty/configure 2006-08-30 15:46:50.000000000 +0200 ++++ ./libiberty/configure 2008-01-27 09:42:50.000000000 +0100 +@@ -6536,6 +6536,7 @@ + *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; + *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; + *-*-msdos*) pexecute=./pex-msdos.o ;; ++ *-*-tyndur*) pexecute=./pex-tyndur.o ;; + *) pexecute=./pex-unix.o ;; + esac + +diff -urN ../gcc-4.5.2/libiberty/configure.ac ./libiberty/configure.ac +--- ../gcc-4.5.2/libiberty/configure.ac 2006-08-30 15:46:50.000000000 +0200 ++++ ./libiberty/configure.ac 2008-01-27 09:42:50.000000000 +0100 +@@ -674,6 +674,7 @@ + *-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;; + *-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;; + *-*-msdos*) pexecute=./pex-msdos.o ;; ++ *-*-tyndur*) pexecute=./pex-tyndur.o ;; + *) pexecute=./pex-unix.o ;; + esac + AC_SUBST(pexecute) +diff -urN ../gcc-4.5.2/libiberty/Makefile.in ./libiberty/Makefile.in +--- ../gcc-4.5.2/libiberty/Makefile.in 2007-03-03 20:29:51.000000000 +0100 ++++ ./libiberty/Makefile.in 2008-01-27 09:42:50.000000000 +0100 +@@ -140,7 +140,7 @@ + objalloc.c obstack.c \ + partition.c pexecute.c \ + pex-common.c pex-djgpp.c pex-msdos.c pex-one.c \ +- pex-unix.c pex-win32.c \ ++ pex-unix.c pex-win32.c pex-tyndur.c \ + physmem.c putenv.c \ + random.c regex.c rename.c rindex.c \ + safe-ctype.c setenv.c sha1.c sigsetmask.c snprintf.c sort.c \ +@@ -845,6 +845,13 @@ + else true; fi + $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) + ++./pex-tyndur.o: $(srcdir)/pex-tyndur.c config.h $(INCDIR)/ansidecl.h \ ++ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h ++ if [ x"$(PICFLAG)" != x ]; then \ ++ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-tyndur.c -o pic/$@; \ ++ else true; fi ++ $(COMPILE.c) $(srcdir)/pex-tyndur.c $(OUTPUT_OPTION) ++ + ./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ + $(INCDIR)/safe-ctype.h +diff -urN ../gcc-4.5.2/libiberty/pex-tyndur.c ./libiberty/pex-tyndur.c +--- ../gcc-4.5.2/libiberty/pex-tyndur.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./libiberty/pex-tyndur.c 2008-02-10 16:39:24.000000000 +0100 +@@ -0,0 +1,200 @@ ++/* Utilities to execute a program in a subprocess (possibly linked by pipes ++ with other subprocesses), and wait for it. Generic Unix version ++ (also used for UWIN and VMS). ++ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ++ Free Software Foundation, Inc. ++ ++This file is part of the libiberty library. ++Libiberty is free software; you can redistribute it and/or ++modify it under the terms of the GNU Library General Public ++License as published by the Free Software Foundation; either ++version 2 of the License, or (at your option) any later version. ++ ++Libiberty is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++Library General Public License for more details. ++ ++You should have received a copy of the GNU Library General Public ++License along with libiberty; see the file COPYING.LIB. If not, ++write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, ++Boston, MA 02110-1301, USA. */ ++ ++#include "config.h" ++#include "libiberty.h" ++#include "pex-common.h" ++ ++#include ++#include ++#include ++#include ++#ifdef NEED_DECLARATION_ERRNO ++extern int errno; ++#endif ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++#ifdef HAVE_STRING_H ++#include ++#endif ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++ ++#include ++ ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++#ifdef HAVE_SYS_WAIT_H ++#include ++#endif ++#ifdef HAVE_GETRUSAGE ++#include ++#include ++#endif ++#ifdef HAVE_SYS_STAT_H ++#include ++#endif ++ ++ ++static int pex_tyndur_open_read (struct pex_obj *, const char *, int); ++static int pex_tyndur_open_write (struct pex_obj *, const char *, int); ++static long pex_tyndur_exec_child (struct pex_obj *, int, const char *, ++ char * const *, char * const *, ++ int, int, int, int, ++ const char **, int *); ++static int pex_tyndur_close (struct pex_obj *, int); ++static int pex_tyndur_wait (struct pex_obj *, long, int *, struct pex_time *, ++ int, const char **, int *); ++static int pex_tyndur_pipe (struct pex_obj *, int *, int); ++static FILE *pex_tyndur_fdopenr (struct pex_obj *, int, int); ++static FILE *pex_tyndur_fdopenw (struct pex_obj *, int, int); ++static void pex_tyndur_cleanup (struct pex_obj *); ++ ++/* The list of functions we pass to the common routines. */ ++ ++const struct pex_funcs funcs = ++{ ++ pex_tyndur_open_read, ++ pex_tyndur_open_write, ++ pex_tyndur_exec_child, ++ pex_tyndur_close, ++ pex_tyndur_wait, ++ NULL, ++ NULL, ++ NULL, ++ NULL ++}; ++ ++/* Return a newly initialized pex_obj structure. */ ++ ++struct pex_obj * ++pex_init (int flags, const char *pname, const char *tempbase) ++{ ++ return pex_init_common (flags, pname, tempbase, &funcs); ++} ++ ++/* Open a file for reading. */ ++ ++static int ++pex_tyndur_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, ++ int binary ATTRIBUTE_UNUSED) ++{ ++ return open (name, O_RDONLY); ++} ++ ++/* Open a file for writing. */ ++ ++static int ++pex_tyndur_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name, ++ int binary ATTRIBUTE_UNUSED) ++{ ++ /* Note that we can't use O_EXCL here because gcc may have already ++ created the temporary file via make_temp_file. */ ++ return open (name, O_WRONLY | O_CREAT | O_TRUNC); ++} ++ ++/* Close a file. */ ++ ++static int ++pex_tyndur_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd) ++{ ++ return close (fd); ++} ++ ++/* Execute a child. */ ++static long ++pex_tyndur_exec_child (struct pex_obj *obj, int flags, const char *executable, ++ char * const * argv, char * const * env, ++ int in, int out, int errdes, ++ int toclose, const char **errmsg, int *err) ++{ ++ size_t len; ++ int i; ++ long pid = 0; ++ /* TODO: We need to find some way to get the env vars to the ++ child, use the pipes and in/out/errdes. */ ++ ++ /* We are going to copy the path to the executable and all the ++ arguments into one string because there is no other possibility ++ at the moment for TYNDUR. */ ++ ++ /* Calculate the total length of the commandline. */ ++ len = strlen (executable); ++ for (i = 1; argv[i] != NULL; i++) { ++ /* Argument + space */ ++ len += strlen (argv[i]) + 1; ++ } ++ ++ /* We need a new block because of the dynamically sized array. */ ++ do { ++ char cmd[len]; ++ int pos = 0; ++ pos = strlen (executable); ++ strcpy (cmd, executable); ++ ++ for (i = 1; argv[i] != NULL; i++) { ++ cmd[pos++] = ' '; ++ strcpy (cmd + pos, argv[i]); ++ pos += strlen (argv[i]); ++ } ++ ++ /* Now that we have the command string the hard part is done. */ ++ pid = init_execute(cmd); ++ } while (0); ++ ++ if (pid == 0) { ++ *err = errno; ++ *errmsg = "pex_tyndur_exec_child"; ++ return -1; ++ } else { ++ return pid; ++ } ++} ++ ++/* Wait for a child process to complete. */ ++ ++static int ++pex_tyndur_wait (struct pex_obj *obj, long pid, int *status, ++ struct pex_time *time, int done, const char **errmsg, ++ int *err) ++{ ++ /* If we are cleaning up when the caller didn't retrieve process ++ status for some reason, encourage the process to go away. */ ++ if (done) ++ kill (pid, SIGTERM); ++ ++ /* Without wait4 or getrusage we can't get any information about ++ the resource usage. So we fill it up with zero. */ ++ if (time != NULL) ++ memset (time, 0, sizeof (struct pex_time)); ++ ++ if (waitpid (pid, status, 0) < 0) { ++ *err = errno; ++ *errmsg = "pex_tyndur_wait"; ++ return -1; ++ } ++ return 0; ++} ++ +diff -urN ../gcc-4.5.2/libgcc/config.host ../gcc-4.5.2/libgcc/config.host.new +--- ../gcc-4.5.2/libgcc/config.host 2011-01-07 18:58:35.599648002 +0100 ++++ ../gcc-4.5.2/libgcc/config.host 2011-01-07 18:58:43.229648001 +0100 +@@ -292,6 +292,8 @@ + ;; + i[34567]86-*-openbsd*) + ;; ++*-*-tyndur*) ++ ;; + i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu*) + extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" + tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm" diff --git a/scripts/build_crosstools b/scripts/build_crosstools index abd8f82..a32bdbc 100755 --- a/scripts/build_crosstools +++ b/scripts/build_crosstools @@ -1,4 +1,23 @@ #!/bin/bash + +# Versionen der Tools +BINUTILS_VERSION=2.21 +GCC_VERSION=4.5.2 +NEEDS_GMP_MAJOR=4 +NEEDS_GMP_MINOR=3 +NEEDS_GMP_PATCHLEVEL=2 +NEEDS_MPFR_MAJOR=2 +NEEDS_MPFR_MINOR=4 +NEEDS_MPFR_PATCHLEVEL=2 +NEEDS_MPC_MAJOR=0 +NEEDS_MPC_MINOR=8 +NEEDS_MPC_PATCHLEVEL=1 +GMP_VERSION=5.0.1 +MPFR_VERSION=3.0.0 +MPC_VERSION=0.8.2 +FPC_VERSION=2.4.0 +FASM_VERSION=1.69.09 + PREFIX=`pwd`/env TARGET=i386-pc-tyndur PATCHES=`pwd`/patches @@ -6,6 +25,12 @@ TMP=`pwd`/tmp LOGS=${TMP} MAKEOPTS=-j3 +# interne Variablen +GCC_CONFIGURE_PARAMS= +BUILD_GMP= +BUILD_MPFR= +BUILD_MPC= + die() { echo -e "$1" exit -1 @@ -20,18 +45,97 @@ mkdir -p ${TMP}/cross-gcc/build mkdir -p ${TMP}/cross-fpc mkdir -p ${TMP}/cross-fasm +# +# User nerven +# + +# Überprüfen ob GMP in richtiger Version installiert +cat < libgmp-test.c +#include +#if __GNU_MP_VERSION < ${NEEDS_GMP_MAJOR} || (__GNU_MP_VERSION == ${NEEDS_GMP_MAJOR} && (__GNU_MP_VERSION_MINOR < ${NEEDS_GMP_MINOR} || (__GNU_MP_VERSION_MINOR == ${NEEDS_GMP_MINOR} && __GNU_MP_VERSION_PATCHLEVEL < ${NEEDS_GMP_PATCHLEVEL}))) +#error unsupported version +#endif +int main(){} +EOF + +gcc libgmp-test.c -lgmp -o libgmp-test &> /dev/null +gcc_state=$? +rm -f libgmp-test libgmp-test.c +if [ $gcc_state != 0 ]; then + echo "Entweder die Entwicklerpakete für GMP sind nicht installiert oder in einer veralteten Version (< ${NEEDS_GMP_MAJOR}.${NEEDS_GMP_MINOR}.${NEEDS_GMP_PATCHLEVEL})."\ + "Wollen sie die Pakete von Hand nachinstallieren bzw. updaten ('j' eingeben)? Falls ihre Distribution keine so aktuellen Pakete zur Verfügung stellt,"\ + "geben Sie bitte 'n' ein und der GMP Quellcode wird automatisch heruntergeladen und installiert (ohne eine vorhandene Installation von GMP zu beeinträchtigen)" + + read should_die + [ "$should_die" == "n" ] || die "Fehler: GMP Bibliothek in Version >= ${NEEDS_GMP_MAJOR}.${NEEDS_GMP_MINOR}.${NEEDS_GMP_PATCHLEVEL} (inklusive -dev Paket) benötigt"; + + BUILD_GMP=1 + GCC_CONFIGURE_PARAMS+="--with-gmp-include=${TMP}/cross-gcc/build/gmp --with-gmp-lib=${TMP}/cross-gcc/build/gmp/.libs" +fi + +# Überprüfen ob MPFR in richtiger Version installiert +cat < libmpfr-test.c +#include +#if MPFR_VERSION_MAJOR < ${NEEDS_MPFR_MAJOR} || (MPFR_VERSION_MAJOR == ${NEEDS_MPFR_MAJOR} && (MPFR_VERSION_MINOR < ${NEEDS_MPFR_MINOR} || (MPFR_VERSION_MINOR == ${NEEDS_MPFR_MINOR} && MPFR_VERSION_PATCHLEVEL < ${NEEDS_MPFR_PATCHLEVEL}))) +#error unsupported version +#endif +int main(){} +EOF + +gcc libmpfr-test.c -lgmp -o libmpfr-test &> /dev/null +gcc_state=$? +rm -f libmpfr-test libmpfr-test.c +if [ $gcc_state != 0 ]; then + echo "Entweder die Entwicklerpakete für MPFR sind nicht installiert oder in einer veralteten Version (< ${NEEDS_MPFR_MAJOR}.${NEEDS_MPFR_MINOR}.${NEEDS_MPFR_PATCHLEVEL})."\ + "Wollen sie die Pakete von Hand nachinstallieren bzw. updaten ('j' eingeben)? Falls ihre Distribution keine so aktuellen Pakete zur Verfügung stellt,"\ + "geben Sie bitte 'n' ein und der MPFR Quellcode wird automatisch heruntergeladen und installiert (ohne eine vorhandene Installation von MPFR zu beeinträchtigen)" + + read should_die + [ "$should_die" == "n" ] || die "Fehler: MPFR Bibliothek in Version >= ${NEEDS_MPFR_MAJOR}.${NEEDS_MPFR_MINOR}.${NEEDS_MPFR_PATCHLEVEL} (inklusive -dev Paket) benötigt"; + + BUILD_MPFR=1 +fi + +# Überprüfen ob MPC in richtiger Version installiert +cat < libmpc-test.c +#include +#if MPC_VERSION_MAJOR < ${NEEDS_MPC_MAJOR} || (MPC_VERSION_MAJOR == ${NEEDS_MPC_MAJOR} && (MPC_VERSION_MINOR < ${NEEDS_MPC_MINOR} || (MPC_VERSION_MINOR == ${NEEDS_MPC_MINOR} && MPC_VERSION_PATCHLEVEL < ${NEEDS_MPC_PATCHLEVEL}))) +#error unsupported version +#endif +int main(){} +EOF + +gcc libmpc-test.c -lgmp -o libmpc-test &> /dev/null +gcc_state=$? +rm -f libmpc-test.c libmpc-test +if [ $gcc_state != 0 ]; then + echo "Entweder die Entwicklerpakete für MPC sind nicht installiert oder in einer veralteten Version (< ${NEEDS_MPC_MAJOR}.${NEEDS_MPC_MINOR}.${NEEDS_MPC_PATCHLEVEL})."\ + "Wollen sie die Pakete von Hand nachinstallieren bzw. updaten ('j' eingeben)? Falls ihre Distribution keine so aktuellen Pakete zur Verfügung stellt,"\ + "geben Sie bitte 'n' ein und der MPC Quellcode wird automatisch heruntergeladen und installiert (ohne eine vorhandene Installation von MPC zu beeinträchtigen)" + + read should_die + [ "$should_die" == "n" ] || die "Fehler: MPC Bibliothek in Version >= ${NEEDS_MPC_MAJOR}.${NEEDS_MPC_MINOR}.${NEEDS_MPC_PATCHLEVEL} (inklusive -dev Paket) benötigt"; + + BUILD_MPC=1 +fi + + +# +# Binutils +# if [ ! -f $PREFIX/bin/i386-pc-tyndur-ld ]; then -rm -rf ${TMP}/cross-binutils/binutils-2.18/ +rm -rf ${TMP}/cross-binutils/binutils-${BINUTILS_VERSION}/ cd ${TMP}/cross-binutils +echo "[binutils] Version " ${BINUTILS_VERSION} echo "[binutils] Herunterladen..." -[ -f binutils-2.18.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/binutils/binutils-2.18.tar.bz2 || die "Fehler beim Herunterladen.\nSiehe tmp/binutils.log für Details." +[ -f binutils-${BINUTILS_VERSION}.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.bz2 || die "Fehler beim Herunterladen." echo "[binutils] Entpacken..." -tar -xjf binutils-2.18.tar.bz2 || die "Fehler beim Entpacken.\nSiehe tmp/binutils.log für Details." +tar -xjf binutils-${BINUTILS_VERSION}.tar.bz2 || die "Fehler beim Entpacken." echo "[binutils] Patch anwenden..." -patch -p0 -d binutils-2.18/ < ${PATCHES}/binutils/2.18/binutils-2.18.patch >${LOGS}/binutils.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/binutils.log für Details." +patch -p0 -d binutils-${BINUTILS_VERSION}/ < ${PATCHES}/binutils/${BINUTILS_VERSION}/binutils-${BINUTILS_VERSION}.patch >${LOGS}/binutils.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/binutils.log für Details." cd build echo "[binutils] Konfigurieren..." -../binutils-2.18/configure --prefix="${PREFIX}" --with-sysroot=${PREFIX} --target=${TARGET} --disable-nls --disable-werror >>${LOGS}/binutils.log || die "Fehler beim Konfigurieren.\nSiehe tmp/binutils.log für Details." +../binutils-${BINUTILS_VERSION}/configure --prefix="${PREFIX}" --with-sysroot=${PREFIX} --target=${TARGET} --disable-nls --disable-werror >>${LOGS}/binutils.log || die "Fehler beim Konfigurieren.\nSiehe tmp/binutils.log für Details." echo "[binutils] Kompilieren..." make ${MAKEOPTS} >>${LOGS}/binutils.log 2>>${LOGS}/binutils.log || die "Fehler beim Kompilieren.\nSiehe tmp/binutils.log für Details." echo "[binutils] Installieren..." @@ -39,42 +143,86 @@ make install ${MAKEOPTS} >>${LOGS}/binutils.log 2>>${LOGS}/binutils.log || die " echo -e "[binutils] Abgeschlossen\n" fi -if [ ! -f $PREFIX/bin/i386-pc-tyndur-gcc ]; then -rm -rf ${TMP}/cross-gcc/gcc-4.2.2/ +# +# GCC +# +if [ ! -f $PREFIX/bin/i386-pc-tyndur-gcc ]; then + +# HACK: Ansonsten wird libgcc nicht kompiliert +rm -f env/include/limits.h + +# GCC herunterladen & entpacken +rm -rf ${TMP}/cross-gcc/build ${TMP}/cross-gcc/gcc-${GCC_VERSION}/ cd ${TMP}/cross-gcc +mkdir build +echo "[gcc] Version " ${GCC_VERSION} echo "[gcc] Herunterladen..." -[ -f gcc-core-4.2.2.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-core-4.2.2.tar.bz2 || die "Fehler beim Herunterladen von gcc-core.\nSiehe tmp/gcc.log für Details." -[ -f gcc-g++-4.2.2.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-g++-4.2.2.tar.bz2 || die "Fehler beim Herunterladen von gcc-g++.\nSiehe tmp/gcc.log für Details." +[ -f gcc-core-${GCC_VERSION}.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-core-${GCC_VERSION}.tar.bz2 || die "Fehler beim Herunterladen von gcc-core." +[ -f gcc-g++-${GCC_VERSION}.tar.bz2 ] || wget -q http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-g++-${GCC_VERSION}.tar.bz2 || die "Fehler beim Herunterladen von gcc-g++." echo "[gcc] Entpacken..." -tar -xjf gcc-core-4.2.2.tar.bz2 -tar -xjf gcc-g++-4.2.2.tar.bz2 +tar -xjf gcc-core-${GCC_VERSION}.tar.bz2 || die "Fehler beim Entpacken von gcc-core." +tar -xjf gcc-g++-${GCC_VERSION}.tar.bz2 || die "Fehler beim Entpacken von gcc-g++." + +if ! [ -z ${BUILD_GMP} ]; then + echo "[gmp] Version " ${GMP_VERSION} + echo "[gmp] Herunterladen..." + [ -f gmp-${GMP_VERSION}.tar.bz2 ] || wget -q ftp://ftp.gmplib.org/pub/gmp-${GMP_VERSION}/gmp-${GMP_VERSION}.tar.bz2 || die "Fehler beim Herunterladen." + echo "[gmp] Entpacken..." + (tar -xjf gmp-${GMP_VERSION}.tar.bz2 && mv gmp-${GMP_VERSION} ${TMP}/cross-gcc/gcc-${GCC_VERSION}/gmp ) || die "Fehler beim Entpacken." +fi + +if ! [ -z ${BUILD_MPFR} ]; then + echo "[mpfr] Version " ${MPFR_VERSION} + echo "[mpfr] Herunterladen..." + [ -f mpfr-${MPFR_VERSION}.tar.bz2 ] || wget -q http://www.mpfr.org/mpfr-current/mpfr-${MPFR_VERSION}.tar.bz2 || die "Fehler beim Herunterladen." + echo "[mpfr] Entpacken..." + (tar -xjf mpfr-${MPFR_VERSION}.tar.bz2 && mv mpfr-${MPFR_VERSION} ${TMP}/cross-gcc/gcc-${GCC_VERSION}/mpfr ) || die "Fehler beim Entpacken." +fi + +if ! [ -z ${BUILD_MPC} ]; then + echo "[mpc] Version " ${MPC_VERSION} + echo "[mpc] Herunterladen..." + [ -f mpc-${MPC_VERSION}.tar.gz ] || wget -q http://www.multiprecision.org/mpc/download/mpc-${MPC_VERSION}.tar.gz || die "Fehler beim Herunterladen." + echo "[mpc] Entpacken..." + (tar -xf mpc-${MPC_VERSION}.tar.gz && mv mpc-${MPC_VERSION} ${TMP}/cross-gcc/gcc-${GCC_VERSION}/mpc ) || die "Fehler beim Entpacken." +fi + +# GCC patchen & bauen echo "[gcc] Patch anwenden..." -patch -p0 -d gcc-4.2.2/ < ${PATCHES}/gcc/4.2.2/gcc-4.2.2.patch >${LOGS}/gcc.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/gcc.log für Details." +patch -p0 -d gcc-${GCC_VERSION}/ < ${PATCHES}/gcc/${GCC_VERSION}/gcc-${GCC_VERSION}.patch >${LOGS}/gcc.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/gcc.log für Details." cd build echo "[gcc] Konfigurieren..." -../gcc-4.2.2/configure --prefix="${PREFIX}" --target=${TARGET} --disable-nls --enable-languages=c,c++ --disable-shared --disable-libssp >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log|| die "Fehler beim Konfigurieren.\nSiehe tmp/gcc.log für Details." +../gcc-${GCC_VERSION}/configure --prefix="${PREFIX}" --target=${TARGET} --disable-nls --enable-languages=c,c++ --disable-shared --disable-libssp ${GCC_CONFIGURE_PARAMS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log|| die "Fehler beim Konfigurieren.\nSiehe tmp/gcc.log für Details." echo "[gcc] Kompilieren..." make all-gcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Kompilieren.\nSiehe tmp/gcc.log für Details." echo "[gcc] Installieren..." -make install-gcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Installieren.\nSiehe tmp/gcc.log für Details." +make install-gcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Installieren\nSiehe tmp/gcc.log für Details." +echo "[gcc] Kompilieren (libgcc)..." +make all-target-libgcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Kompilieren der libgcc.\nSiehe tmp/gcc.log für Details." +echo "[gcc] Installieren (libgcc)..." +make install-target-libgcc ${MAKEOPTS} >>${LOGS}/gcc.log 2>>${LOGS}/gcc.log || die "Fehler beim Installieren der libgcc.\nSiehe tmp/gcc.log für Details." echo -e "[gcc] Abgeschlossen\n" -fi +fi +# +# FPC +# if [ ! -f $PREFIX/bin/fpc ]; then -rm -rf ${TMP}/cross-fpc/fpc-2.4.0/ +rm -rf ${TMP}/cross-fpc/fpc-${FPC_VERSION}/ cd ${TMP}/cross-fpc +echo "[fpc] Version " ${FPC_VERSION} echo "[fpc] Herunterladen..." # [ -f fpc-2.2.2.source.tar.gz ] || wget -q http://gd.tuwien.ac.at/languages/pascal/fpc/dist/source-2.2.2/fpc-2.2.2.source.tar.gz || exit -1 #[ -f fpc.zip ] || wget -q ftp://ftp.freepascal.org/pub/fpc/snapshot/trunk/source/fpc.zip || exit -1 -[ -f fpc-2.4.0.source.tar.gz ] || wget -q ftp://gd.tuwien.ac.at/languages/pascal/fpc/dist/2.4.0/source/fpc-2.4.0.source.tar.gz || die "Fehler beim Herunterladen.\nSiehe tmp/fpc.log für Details." +[ -f fpc-${FPC_VERSION}.source.tar.gz ] || wget -q ftp://gd.tuwien.ac.at/languages/pascal/fpc/dist/${FPC_VERSION}/source/fpc-${FPC_VERSION}.source.tar.gz || die "Fehler beim Herunterladen." echo "[fpc] Entpacken..." #tar -xzf fpc-2.2.2.source.tar.gz || exit -1 #unzip -qo fpc.zip || exit -1 -tar -xzf fpc-2.4.0.source.tar.gz || die "Fehler beim Entpacken.\nSiehe tmp/fpc.log für Details." +tar -xzf fpc-${FPC_VERSION}.source.tar.gz || die "Fehler beim Entpacken." echo "[fpc] Patch anwenden..." -patch -p0 < ${PATCHES}/fpc/2.4.0/fpc-2.4.0.patch >${LOGS}/fpc.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/fpc.log für Details." +patch -p0 < ${PATCHES}/fpc/${FPC_VERSION}/fpc-${FPC_VERSION}.patch >${LOGS}/fpc.log || die "Fehler beim Anwenden des Patches.\nSiehe tmp/fpc.log für Details." #echo "[fpc] fpcmake bauen" #cd fpcbuild_2.0.4_exp/fpcsrc/utils/fpcm #make >>${LOGS}/fpc.log || exit -1 @@ -82,7 +230,7 @@ patch -p0 < ${PATCHES}/fpc/2.4.0/fpc-2.4.0.patch >${LOGS}/fpc.log || die "Fehler #cd .. echo "[fpc] Erzeuge Hilfsskripte..." -cd fpc-2.4.0 +cd fpc-${FPC_VERSION} cat >> i386-linux-ld <<"EOF" #!/bin/sh @@ -108,18 +256,22 @@ cp utils/fpcm/fpcmake ${PREFIX}/bin/fpcmake echo -e "[fpc] Abgeschlossen\n" fi +# +# FASM +# if [ ! -f $PREFIX/bin/fasm ]; then rm -rf ${TMP}/cross-fasm/fasm/ cd ${TMP}/cross-fasm +echo "[fasm] Version " ${FASM_VERSION} echo "[fasm] Herunterladen..." -[ -f fasm-1.69.09.tar.gz ] || wget -q http://flatassembler.net/fasm-1.69.09.tar.gz || die "Fehler beim Herunterladen." +[ -f fasm-${FASM_VERSION}.tar.gz ] || wget -q http://flatassembler.net/fasm-${FASM_VERSION}.tar.gz || die "Fehler beim Herunterladen." echo "[fasm] Entpacken..." -tar -xzf fasm-1.69.09.tar.gz || die "Fehler beim Entpacken." +tar -xzf fasm-${FASM_VERSION}.tar.gz || die "Fehler beim Entpacken." echo "[fasm] Linux-FASM linken..." cd fasm gcc -m32 fasm.o -o fasm || die "Fehler beim Linken des Linux-FASM." echo "[fasm] Patch anwenden..." -patch source/formats.inc ${PATCHES}/fasm/1.69.09/formats.patch || die "Fehler beim Anwenden des Patches." +patch source/formats.inc ${PATCHES}/fasm/${FASM_VERSION}/formats.patch || die "Fehler beim Anwenden des Patches." echo "[fasm] Assemblieren..." ./fasm source/libc/fasm.asm fasm.o || die "Fehler beim Assemblieren." echo "[fasm] Týndur-FASM linken..." -- 1.7.1 From toni at tyndur.org Sun Jan 9 01:48:39 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sun, 9 Jan 2011 01:48:39 +0100 Subject: [tyndur-devel] [PATCH] buildmk.sh: Fix fuer grub1-Images Message-ID: <1294534119-27978-1-git-send-email-toni@tyndur.org> ! buildmk.sh: Wenn wir beim suchen nach dem stage1-Archiv auch die Variable $LOST_GRUB_STAGESDIR statt $GRUB_STAGEDIR benutzen kann ich sogar wieder Images mit grub1 bauen. Signed-off-by: Antoine Kaufmann --- buildmk.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/buildmk.sh b/buildmk.sh index 6992081..d23722f 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -88,7 +88,7 @@ PPC_BINARY=$LOST_TOOLS_PPC EOF # Ist grub legacy installiert? -if [ -f $GRUB_STAGEDIR/stage1 ]; then +if [ -f $LOST_GRUB_STAGESDIR/stage1 ]; then echo GRUB_VERSION=grub1 >> Makefile.local else echo GRUB_VERSION=grub2 >> Makefile.local -- 1.7.2.2 From m.nemo at gmx.net Sun Jan 9 15:41:32 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 15:41:32 +0100 Subject: [tyndur-devel] [PATCH] git: gitignore Liste erweitert Message-ID: <1294584092-2764-1-git-send-email-m.nemo@gmx.net> + /myconf.sh gehört nicht ins Repo + /lbuilds haben ihr eigenes Repo + /build/(root|images|output) sind Auto-generiert Binärdaten Signed-off-by: Andreas Freimuth --- .gitignore | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index efd738e..7142323 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,8 @@ link.res ppas.sh *.rst *.orig +/myconf.sh +/lbuilds +/build/root +/build/images +/build/output -- 1.7.3.4 From toni at tyndur.org Sun Jan 9 15:44:54 2011 From: toni at tyndur.org (Antoine Kaufmann) Date: Sun, 9 Jan 2011 15:44:54 +0100 Subject: [tyndur-devel] [PATCH] git: gitignore Liste erweitert In-Reply-To: <1294584092-2764-1-git-send-email-m.nemo@gmx.net> References: <1294584092-2764-1-git-send-email-m.nemo@gmx.net> Message-ID: <20110109144454.GI7079@neo.geekcave.lan> On Sun, Jan 09 15:41, Andreas Freimuth wrote: > + /myconf.sh gehört nicht ins Repo > + /lbuilds haben ihr eigenes Repo Also ich habe das lbuilds-Repo ja jeweils in einem eigenen Verzeichnis. > + /build/(root|images|output) sind Auto-generiert Binärdaten > > Signed-off-by: Andreas Freimuth -- Antoine Kaufmann -------------- nächster Teil -------------- Ein Dateianhang mit Binärdaten wurde abgetrennt... Dateiname : nicht verfügbar Dateityp : application/pgp-signature Dateigröße : 198 bytes Beschreibung: nicht verfügbar URL : From m.nemo at gmx.net Sun Jan 9 19:07:21 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 19:07:21 +0100 Subject: [tyndur-devel] [PATCH] image_hd: nicht einfach andere Prozesse killen Message-ID: <1294596441-28604-1-git-send-email-m.nemo@gmx.net> ! image_hd: Prozesse die das unmounten verhindern nicht gleich töten sondern warten bis den Mountpoint freiwillig hergeben Signed-off-by: Andreas Freimuth --- build/scripts/image_hd_grub1 | 2 +- build/scripts/image_hd_grub2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/scripts/image_hd_grub1 b/build/scripts/image_hd_grub1 index 402f68e..6f29243 100755 --- a/build/scripts/image_hd_grub1 +++ b/build/scripts/image_hd_grub1 @@ -106,7 +106,7 @@ if [ $NEW -ne 0 ]; then fi # Partition unmounten und loopback-Device freigeben -fuser -km $MOUNT +while fuser -m $MOUNT; do true; done $SUDO umount $MOUNT rmdir $MOUNT diff --git a/build/scripts/image_hd_grub2 b/build/scripts/image_hd_grub2 index a49c3fc..cddc78b 100755 --- a/build/scripts/image_hd_grub2 +++ b/build/scripts/image_hd_grub2 @@ -131,7 +131,7 @@ EOF fi # Partition unmounten und loopback-Device freigeben -fuser -km $MOUNT +while fuser -m $MOUNT; do true; done $SUDO umount $MOUNT rmdir $MOUNT -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:24 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:24 +0100 Subject: [tyndur-devel] [PATCH 02/11] kernel2: wenn mulitboot_info verwendet wird sollte auch "multiboot.h" eingebunden werden In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-2-git-send-email-m.nemo@gmx.net> ! task.h included jetzt auch "multiboot.h" da es mulitboot_info verwendet Signed-off-by: Andreas Freimuth --HG-- extra : rebase_source : 70e489f0576375749a75aa9f2d22a4cf7ff081e1 --- src/kernel2/include/tasks.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/kernel2/include/tasks.h b/src/kernel2/include/tasks.h index 8239527..4ae09cd 100644 --- a/src/kernel2/include/tasks.h +++ b/src/kernel2/include/tasks.h @@ -44,6 +44,7 @@ #include "mm_arch.h" #include "lock.h" +#include "multiboot.h" #define PM_STATUS_READY 0 #define PM_STATUS_BLOCKED 1 -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:23 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:23 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_01/11=5D_libc=3A_stddef=2Eh_ist?= =?utf-8?q?_Architektur_unabh=C3=A4ngig?= Message-ID: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> * libc: arch/i386/stddef.h nach stddef.h * libc: für ptrdiff_t auf GCC Standard Macros zurückgreifen Signed-off-by: Andreas Freimuth --HG-- rename : src/include/arch/i386/stddef.h => src/include/stddef.h extra : rebase_source : 31a5db00da621dcf60136a51b3bd95f69f90c288 --- src/include/arch/i386/stddef.h | 47 ---------------------------------------- src/include/stddef.h | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 src/include/arch/i386/stddef.h create mode 100644 src/include/stddef.h diff --git a/src/include/arch/i386/stddef.h b/src/include/arch/i386/stddef.h deleted file mode 100644 index 8c0720d..0000000 --- a/src/include/arch/i386/stddef.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2006-2007 tyndur Project. All rights reserved. - * - * This code is derived from software contributed to the tyndur Project - * by Kevin Wolf. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _STDDEF_H_ -#define _STDDEF_H_ -#include -#include - -#ifndef __cplusplus -#define NULL (void*) 0 -#else -#define NULL 0 -#endif - -typedef __SIZE_TYPE__ size_t; -typedef int ptrdiff_t; -#ifndef __cplusplus -typedef __WCHAR_TYPE__ wchar_t; -#endif - -#endif - diff --git a/src/include/stddef.h b/src/include/stddef.h new file mode 100644 index 0000000..21b2813 --- /dev/null +++ b/src/include/stddef.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2006-2007 tyndur Project. All rights reserved. + * + * This code is derived from software contributed to the tyndur Project + * by Kevin Wolf. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _STDDEF_H_ +#define _STDDEF_H_ +#include +#include + +#ifndef __cplusplus +#define NULL (void*) 0 +#else +#define NULL 0 +#endif + +typedef __SIZE_TYPE__ size_t; +typedef __PTRDIFF_TYPE__ ptrdiff_t; +#ifndef __cplusplus +typedef __WCHAR_TYPE__ wchar_t; +#endif + +#endif + -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:25 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:25 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_03/11=5D_libc=3A_stdint=2Eh_f?= =?utf-8?q?=C3=BCr_arch/amd64?= In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-3-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --HG-- extra : rebase_source : e1b8b5b8dbec6d33701ecfe14d6e2d6d0d42d464 --- src/include/arch/amd64/stdint.h | 153 +++++++++++++++++++++++++++++++++------ 1 files changed, 132 insertions(+), 21 deletions(-) diff --git a/src/include/arch/amd64/stdint.h b/src/include/arch/amd64/stdint.h index adcd92d..723f0ea 100644 --- a/src/include/arch/amd64/stdint.h +++ b/src/include/arch/amd64/stdint.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2006 The tyndur Project. All rights reserved. * * This code is derived from software contributed to the tyndur Project @@ -13,37 +13,148 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + */ #ifndef _STDINT_H_ #define _STDINT_H_ -#include "types.h" +#define INT8_MIN -128 +#define INT8_MAX 127 +#define UINT8_MAX 255 -typedef sbyte int8_t; -typedef sword int16_t; -typedef sdword int32_t; -typedef sqword int64_t; +#define INT16_MIN -32768 +#define INT16_MAX 32767 +#define UINT16_MAX 65535 -typedef byte uint8_t; -typedef word uint16_t; -typedef dword uint32_t; -typedef qword uint64_t; +#define INT32_MIN ((int32_t) -0x80000000) +#define INT32_MAX 0x7FFFFFFF +#define UINT32_MAX ((uint32_t) -1) +#define INT64_MIN ((int64_t) -0x8000000000000000LL) +#define INT64_MAX 0x7FFFFFFFFFFFFFFFLL +#define UINT64_MAX ((uint64_t) -1ULL) + +typedef signed char int8_t; +typedef signed short int16_t; +typedef signed int int32_t; +typedef signed long int64_t; + +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long uint64_t; + + +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST8_MAX INT8_MAX +#define UINT_LEAST8_MAX UINT8_MAX + +#define INT_LEAST16_MIN INT32_MIN +#define INT_LEAST16_MAX INT32_MAX +#define UINT_LEAST16_MAX UINT32_MAX + +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST32_MAX INT32_MAX +#define UINT_LEAST32_MAX UINT32_MAX + +#define INT_LEAST64_MIN INT64_MIN +#define INT_LEAST64_MAX INT64_MAX +#define UINT_LEAST64_MAX UINT64_MAX + +typedef int8_t int_least8_t; +typedef int32_t int_least16_t; +typedef int32_t int_least32_t; +typedef int64_t int_least64_t; + +typedef uint8_t uint_least8_t; +typedef uint32_t uint_least16_t; +typedef uint32_t uint_least32_t; +typedef uint64_t uint_least64_t; + + +#define INT_FAST8_MIN INT8_MIN +#define INT_FAST8_MAX INT8_MAX +#define UINT_FAST8_MAX UINT8_MAX + +#define INT_FAST16_MIN INT32_MIN +#define INT_FAST16_MAX INT32_MAX +#define UINT_FAST16_MAX UINT32_MAX + +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST32_MAX INT32_MAX +#define UINT_FAST32_MAX UINT32_MAX + +#define INT_FAST64_MIN INT64_MIN +#define INT_FAST64_MAX INT64_MAX +#define UINT_FAST64_MAX UINT64_MAX + +typedef int8_t int_fast8_t; +typedef int32_t int_fast16_t; +typedef int32_t int_fast32_t; +typedef int64_t int_fast64_t; + +typedef uint8_t uint_fast8_t; +typedef uint32_t uint_fast16_t; +typedef uint32_t uint_fast32_t; +typedef uint64_t uint_fast64_t; + + +#define INTPTR_MIN INT64_MIN +#define INTPTR_MAX INT64_MAX +#define UINTPTR_MAX UINT64_MAX + +#define INTMAX_MIN INT64_MIN +#define INTMAX_MAX INT64_MAX +#define UINTMAX_MAX UINT64_MAX -typedef dword uint_fast32_t; typedef uint64_t uintptr_t; -typedef int64_t intptr_t; +typedef int64_t intptr_t; + +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; + +/* MIN/MAX für Typen aus anderen Headern */ + +#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MAX INT64_MAX + +#ifdef __WCHAR_UNSIGNED__ +# define WCHAR_MIN 0 +#else +# define WCHAR_MIN (-__WCHAR_MAX__ - 1) +#endif +#define WCHAR_MAX __WCHAR_MAX__ + +#define WINT_MIN WCHAR_MIN +#define WINT_MAX WCHAR_MAX + +#define SIG_ATOMIC_MIN 0 +#define SIG_ATOMIC_MAX UINT32_MAX + +#define SIZE_MAX ((size_t) -1) + + +/* Makros für Integerkonstanten */ + +#define INT8_C(x) ((int_least8_t) x) +#define INT16_C(x) ((int_least16_t) x) +#define INT32_C(x) ((int_least32_t) x) +#define INT64_C(x) ((int_least64_t) x ## L) + +#define UINT8_C(x) ((uint_least8_t) x) +#define UINT16_C(x) ((uint_least16_t) x) +#define UINT32_C(x) ((uint_least32_t) x) +#define UINT64_C(x) ((uint_least64_t) x ## UL) #endif -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:26 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:26 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_04/11=5D_typen=3A_veraltete_typ?= =?utf-8?q?en_qword=2C_=2E=2E=2E_byte_ersetzt?= In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-4-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --HG-- rename : src/include/arch/i386/types.h => src/include/types.h extra : rebase_source : 3bd8c54b6e6732160b500255a3d59c51fd150a74 --- src/include/arch/amd64/types.h | 61 ------------------- src/include/arch/i386/types.h | 59 ------------------- src/include/types.h | 59 +++++++++++++++++++ src/kernel2/include/arch/amd64/cpu.h | 51 ++++++++-------- src/kernel2/include/debug.h | 4 +- src/kernel2/src/arch/amd64/cpu.c | 88 ++++++++++++++-------------- src/kernel2/src/arch/amd64/debug.c | 2 +- src/kernel2/src/arch/amd64/im/im.c | 32 +++++----- src/kernel2/src/arch/amd64/loader/loader.c | 3 +- src/kernel2/src/arch/amd64/mm/mm_context.c | 22 ++++---- src/kernel2/src/arch/amd64/mm/mm_virt.c | 8 +- 11 files changed, 164 insertions(+), 225 deletions(-) delete mode 100644 src/include/arch/amd64/types.h delete mode 100644 src/include/arch/i386/types.h create mode 100644 src/include/types.h diff --git a/src/include/arch/amd64/types.h b/src/include/arch/amd64/types.h deleted file mode 100644 index e4e4ecc..0000000 --- a/src/include/arch/amd64/types.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2006 The tyndur Project. All rights reserved. - * - * This code is derived from software contributed to the tyndur Project - * by Kevin Wolf. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef TYPES_H -#define TYPES_H - -#define NULL (void*) 0 - -#ifndef __cplusplus -typedef enum { FALSE = 0, TRUE } bool; -#endif - -typedef unsigned char byte; -typedef unsigned short word; -typedef unsigned int dword; -typedef unsigned long long qword; - -typedef signed char sbyte; -typedef signed short sword; -typedef signed int sdword; -typedef signed long long sqword; - -typedef __SIZE_TYPE__ size_t; -typedef __SIZE_TYPE__ ssize_t; - -typedef void * paddr_t; -typedef void * vaddr_t; - -typedef dword pid_t; -typedef dword uid_t; -typedef dword thread_id_t; - -typedef qword timestamp_t; - -typedef qword syscall_id_t; -#endif diff --git a/src/include/arch/i386/types.h b/src/include/arch/i386/types.h deleted file mode 100644 index c6a43d3..0000000 --- a/src/include/arch/i386/types.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2006 The tyndur Project. All rights reserved. - * - * This code is derived from software contributed to the tyndur Project - * by Kevin Wolf. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _TYPES_H_ -#define _TYPES_H_ -#include -#include - -typedef signed int ssize_t; - -typedef void * paddr_t; -typedef void * vaddr_t; - -typedef unsigned int pid_t; -typedef unsigned int uid_t; -typedef unsigned int gid_t; - -#endif - -// FIXME Um pid_t aus sys/types holen zu koennen -#ifndef _NO_LOST_TYPES - -// Schutz vor mehrfachen Deklarationen -#ifndef _LOST_TYPES_ -#define _LOST_TYPES_ - - - -typedef uint64_t timestamp_t; - -typedef uint32_t syscall_id_t; -#endif // ndef _LOST_TYPES_ -#endif // ndef _NO_LOST_TYPES - diff --git a/src/include/types.h b/src/include/types.h new file mode 100644 index 0000000..1ae793f --- /dev/null +++ b/src/include/types.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2006 The tyndur Project. All rights reserved. + * + * This code is derived from software contributed to the tyndur Project + * by Kevin Wolf. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _TYPES_H_ +#define _TYPES_H_ +#include +#include + +typedef signed long ssize_t; + +typedef void * paddr_t; +typedef void * vaddr_t; + +typedef unsigned int pid_t; +typedef unsigned int uid_t; +typedef unsigned int gid_t; + +#endif + +// FIXME Um pid_t aus sys/types holen zu koennen +#ifndef _NO_LOST_TYPES + +// Schutz vor mehrfachen Deklarationen +#ifndef _LOST_TYPES_ +#define _LOST_TYPES_ + + + +typedef uint64_t timestamp_t; + +typedef uint32_t syscall_id_t; +#endif // ndef _LOST_TYPES_ +#endif // ndef _NO_LOST_TYPES + diff --git a/src/kernel2/include/arch/amd64/cpu.h b/src/kernel2/include/arch/amd64/cpu.h index 8de9552..bd60f26 100644 --- a/src/kernel2/include/arch/amd64/cpu.h +++ b/src/kernel2/include/arch/amd64/cpu.h @@ -35,42 +35,41 @@ #ifndef _CPU_H_ #define _CPU_H_ +#include #include #include "mm.h" -typedef byte cpu_id_t; +typedef uint8_t cpu_id_t; typedef struct { cpu_id_t id; - byte apic_id; + uint8_t apic_id; bool bootstrap; } cpu_t; typedef struct { - qword rbx; - qword rcx; - qword rdx; - qword rsi; - qword rdi; - qword rbp; - qword r[8]; - - qword ds; - qword es; - /*qword fs; - qword gs;*/ + uint64_t rbx; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t rbp; + uint64_t r[8]; - qword rax; + uint64_t ds; + uint64_t es; - qword interrupt_number; - qword error_code; - qword rip; - qword cs; - qword rflags; - qword rsp; - qword ss; - //qword r[8]; - qword fs, gs; + uint64_t rax; + + uint64_t interrupt_number; + uint64_t error_code; + uint64_t rip; + uint64_t cs; + uint64_t rflags; + uint64_t rsp; + uint64_t ss; + + uint64_t fs, gs; } __attribute__((packed)) interrupt_stack_frame_t; typedef interrupt_stack_frame_t machine_state_t; @@ -84,8 +83,8 @@ cpu_t* cpu_get(cpu_id_t id); cpu_t* cpu_get_current(); void cpu_dump(machine_state_t* machine_state); -void cpu_write_msr(dword msr, qword value); -qword cpu_read_msr(dword reg); +void cpu_write_msr(uint32_t msr, uint64_t value); +uint64_t cpu_read_msr(uint32_t reg); mmc_context_t cpu_get_context(); void cpu_set_context(mmc_context_t context); diff --git a/src/kernel2/include/debug.h b/src/kernel2/include/debug.h index 99eafca..0b9ba66 100644 --- a/src/kernel2/include/debug.h +++ b/src/kernel2/include/debug.h @@ -57,8 +57,8 @@ void debug_print(uint32_t flag, const char* message); /* * Gibt einen Stack Backtrace aus, beginnend an den übergebenen Werten - * für ebp und eip + * für bp und ip */ -void stack_backtrace(uint32_t start_ebp, uint32_t start_eip); +void stack_backtrace(uintptr_t start_bp, uintptr_t start_ip); #endif diff --git a/src/kernel2/src/arch/amd64/cpu.c b/src/kernel2/src/arch/amd64/cpu.c index 9e3c18e..b9f2b7d 100644 --- a/src/kernel2/src/arch/amd64/cpu.c +++ b/src/kernel2/src/arch/amd64/cpu.c @@ -77,7 +77,7 @@ cpu_t* cpu_get(cpu_id_t id) */ cpu_t* cpu_get_current() { - byte apic_id = apic_read(0x20) >> 24; + uint8_t apic_id = apic_read(0x20) >> 24; cpu_id_t i; for (i = 0; i < cpu_count; i++) { @@ -95,10 +95,10 @@ cpu_t* cpu_get_current() * @param msr Adresse des Registers * @param value Neuer Wert */ -void cpu_write_msr(dword msr, qword value) +void cpu_write_msr(uint32_t msr, uint64_t value) { - dword low = value & 0xFFFFFFFF; - dword high = (value >> 32) & 0xFFFFFFFF; + uint32_t low = value & 0xFFFFFFFF; + uint32_t high = (value >> 32) & 0xFFFFFFFF; asm ("wrmsr" : : "a" (low), "d" (high),"c" (msr)); } @@ -109,11 +109,11 @@ void cpu_write_msr(dword msr, qword value) * * @return Wert der im MSR gespeichert ist */ -qword cpu_read_msr(dword msr) +uint64_t cpu_read_msr(uint32_t msr) { - dword low, high; + uint32_t low, high; asm ("rdmsr" : "=a" (low), "=d" (high) : "c" (msr)); - return low | ((qword)high << 32); + return low | ((uint64_t)high << 32); } /** @@ -124,47 +124,47 @@ qword cpu_read_msr(dword msr) void cpu_dump(machine_state_t* machine_state) { kprintf("RAX=0x%08x%08x RBX=0x%08x%08x RCX=0x%08x%08x\n", - (dword) (machine_state->rax >> 32), - (dword) (machine_state->rax & 0xFFFFFFFF), - (dword) (machine_state->rbx >> 32), - (dword) (machine_state->rbx & 0xFFFFFFFF), - (dword) (machine_state->rcx >> 32), - (dword) (machine_state->rcx & 0xFFFFFFFF)); + (uint32_t) (machine_state->rax >> 32), + (uint32_t) (machine_state->rax & 0xFFFFFFFF), + (uint32_t) (machine_state->rbx >> 32), + (uint32_t) (machine_state->rbx & 0xFFFFFFFF), + (uint32_t) (machine_state->rcx >> 32), + (uint32_t) (machine_state->rcx & 0xFFFFFFFF)); kprintf("RDX=0x%08x%08x RSI=0x%08x%08x RDI=0x%08x%08x\n", - (dword) (machine_state->rdx >> 32), - (dword) (machine_state->rdx & 0xFFFFFFFF), - (dword) (machine_state->rsi >> 32), - (dword) (machine_state->rsi & 0xFFFFFFFF), - (dword) (machine_state->rdi >> 32), - (dword) (machine_state->rdi & 0xFFFFFFFF)); + (uint32_t) (machine_state->rdx >> 32), + (uint32_t) (machine_state->rdx & 0xFFFFFFFF), + (uint32_t) (machine_state->rsi >> 32), + (uint32_t) (machine_state->rsi & 0xFFFFFFFF), + (uint32_t) (machine_state->rdi >> 32), + (uint32_t) (machine_state->rdi & 0xFFFFFFFF)); kprintf("RSP=0x%08x%08x RBP=0x%08x%08x R08=0x%08x%08x\n", - (dword) (machine_state->rsp >> 32), - (dword) (machine_state->rsp & 0xFFFFFFFF), - (dword) (machine_state->rbp >> 32), - (dword) (machine_state->rbp & 0xFFFFFFFF), - (dword) (machine_state->r[0] >> 32), - (dword) (machine_state->r[0] & 0xFFFFFFFF)); + (uint32_t) (machine_state->rsp >> 32), + (uint32_t) (machine_state->rsp & 0xFFFFFFFF), + (uint32_t) (machine_state->rbp >> 32), + (uint32_t) (machine_state->rbp & 0xFFFFFFFF), + (uint32_t) (machine_state->r[0] >> 32), + (uint32_t) (machine_state->r[0] & 0xFFFFFFFF)); kprintf("R09=0x%08x%08x R10=0x%08x%08x R11=0x%08x%08x\n", - (dword) (machine_state->r[1] >> 32), - (dword) (machine_state->r[1] & 0xFFFFFFFF), - (dword) (machine_state->r[2] >> 32), - (dword) (machine_state->r[2] & 0xFFFFFFFF), - (dword) (machine_state->r[3] >> 32), - (dword) (machine_state->r[3] & 0xFFFFFFFF)); + (uint32_t) (machine_state->r[1] >> 32), + (uint32_t) (machine_state->r[1] & 0xFFFFFFFF), + (uint32_t) (machine_state->r[2] >> 32), + (uint32_t) (machine_state->r[2] & 0xFFFFFFFF), + (uint32_t) (machine_state->r[3] >> 32), + (uint32_t) (machine_state->r[3] & 0xFFFFFFFF)); kprintf("R12=0x%08x%08x R13=0x%08x%08x R14=0x%08x%08x\n", - (dword) (machine_state->r[4] >> 32), - (dword) (machine_state->r[4] & 0xFFFFFFFF), - (dword) (machine_state->r[5] >> 32), - (dword) (machine_state->r[5] & 0xFFFFFFFF), - (dword) (machine_state->r[6] >> 32), - (dword) (machine_state->r[6] & 0xFFFFFFFF)); + (uint32_t) (machine_state->r[4] >> 32), + (uint32_t) (machine_state->r[4] & 0xFFFFFFFF), + (uint32_t) (machine_state->r[5] >> 32), + (uint32_t) (machine_state->r[5] & 0xFFFFFFFF), + (uint32_t) (machine_state->r[6] >> 32), + (uint32_t) (machine_state->r[6] & 0xFFFFFFFF)); kprintf("R15=0x%08x%08x RIP=0x%08x%08x RFL=0x%08x%08x\n", - (dword) (machine_state->r[7] >> 32), - (dword) (machine_state->r[7] & 0xFFFFFFFF), - (dword) (machine_state->rip >> 32), - (dword) (machine_state->rip & 0xFFFFFFFF), - (dword) (machine_state->rflags >> 32), - (dword) (machine_state->rflags & 0xFFFFFFFF)); + (uint32_t) (machine_state->r[7] >> 32), + (uint32_t) (machine_state->r[7] & 0xFFFFFFFF), + (uint32_t) (machine_state->rip >> 32), + (uint32_t) (machine_state->rip & 0xFFFFFFFF), + (uint32_t) (machine_state->rflags >> 32), + (uint32_t) (machine_state->rflags & 0xFFFFFFFF)); kprintf("CS=0x%04x DS=0x%04x ES=0x%04x FS=0x%04x GS=0x%04x " "SS=0x%04x\n", @@ -172,7 +172,7 @@ void cpu_dump(machine_state_t* machine_state) machine_state->es & 0xFFFF, machine_state->fs & 0xFFFF, machine_state->gs & 0xFFFF, machine_state->ss & 0xFFFF); - qword cr[5]; + uint64_t cr[5]; asm("movq %%cr0, %0" : "=A" (cr[0])); asm("movq %%cr2, %0" : "=A" (cr[2])); asm("movq %%cr3, %0" : "=A" (cr[3])); diff --git a/src/kernel2/src/arch/amd64/debug.c b/src/kernel2/src/arch/amd64/debug.c index aa5cddb..589d9dc 100644 --- a/src/kernel2/src/arch/amd64/debug.c +++ b/src/kernel2/src/arch/amd64/debug.c @@ -42,7 +42,7 @@ #include "multiboot.h" #include "debug.h" -void stack_backtrace(qword start_rbp, qword start_rip) +void stack_backtrace(uintptr_t start_rbp, uintptr_t start_rip) { struct stack_frame { diff --git a/src/kernel2/src/arch/amd64/im/im.c b/src/kernel2/src/arch/amd64/im/im.c index da1870d..c0eeb74 100644 --- a/src/kernel2/src/arch/amd64/im/im.c +++ b/src/kernel2/src/arch/amd64/im/im.c @@ -47,29 +47,29 @@ typedef struct { /// Die untersten 16 Bits der Handler-Adresse - word offset_low; + uint16_t offset_low; /// Code-Segment-Selektor - word segment; + uint16_t segment; /// ID des Stack-Table-Eintrages - byte interrupt_stack_table : 3; + uint8_t interrupt_stack_table : 3; /// Reserviert - byte : 5; + uint8_t : 5; /// Typ des Gates - byte type : 4; + uint8_t type : 4; /// Reserviert - byte : 1; + uint8_t : 1; /// Noetiges Privileg-Level um den Handler aufrufen zu duerfen - byte privilege_level : 2; + uint8_t privilege_level : 2; /// Bestimmt, ob das Gate praesent bool present : 1; /// Die naechsten paar Bits der Adresse - word offset_mid; - dword offset_high; + uint16_t offset_mid; + uint32_t offset_high; /// Reserviert - dword : 32; + uint32_t : 32; } __attribute__((packed)) idt_gate_t; @@ -77,7 +77,7 @@ typedef struct { idt_gate_t idt[IDT_GATE_COUNT]; bool use_apic; -static void idt_set_gate(size_t interrupt, vaddr_t handler, byte privilege_level); +static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_level); // Die ASM-Stubs extern void im_int_stub_0(); @@ -609,11 +609,11 @@ void im_enable() { // Register zum laden der IDT vorbereiten struct { - word size; - qword base; + uint16_t size; + uint64_t base; } __attribute__((packed)) idt_ptr = { .size = IDT_GATE_COUNT * sizeof(idt_gate_t) - 1, - .base = (qword)idt, + .base = (uint64_t)idt, }; asm("lidt %0" : : "m" (idt_ptr)); @@ -627,7 +627,7 @@ void im_enable() * @param privilege_level Bestimmt ob der Interrup fuer den Kernel- (0) oder * fuer den User-Ring (3) bestimmt ist. */ -static void idt_set_gate(size_t interrupt, vaddr_t handler, byte privilege_level) +static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_level) { // Handler-Adresse uintptr_t uint_handler = (uintptr_t) handler; @@ -647,7 +647,7 @@ static void idt_set_gate(size_t interrupt, vaddr_t handler, byte privilege_level * * @param interrupt Interruptnummer */ -void im_end_of_interrupt(byte interrupt) +void im_end_of_interrupt(uint8_t interrupt) { // Nur mit dem traditionellen PIC if (use_apic == FALSE) { diff --git a/src/kernel2/src/arch/amd64/loader/loader.c b/src/kernel2/src/arch/amd64/loader/loader.c index 39976b8..fff1940 100644 --- a/src/kernel2/src/arch/amd64/loader/loader.c +++ b/src/kernel2/src/arch/amd64/loader/loader.c @@ -32,6 +32,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include @@ -43,7 +44,7 @@ void print(const char* str); /** * Hauptfunktion des Loaders. */ -void loader(qword multiboot_info_addr) +void loader(uint64_t multiboot_info_addr) { extern void* _binary_kernel_start; Elf64_Ehdr* elf_header = (Elf64_Ehdr*) (&_binary_kernel_start); diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index 751e4de..b6d5274 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -145,11 +145,11 @@ static mmc_pdpt_entry_t* pdpt_get(mmc_pm_entry_t* pm, // Die PDPT wird sauber mit Null initialisiert => Present-Bit // geloescht. memset(pdpt, 0, PAGE_SIZE); - + // Die pdpt wird in der Pagemap eingetragen - pm[index] = (qword) phys | PAGE_FLAGS_PRESENT | + pm[index] = (mmc_pm_entry_t) phys | PAGE_FLAGS_PRESENT | PAGE_FLAGS_WRITABLE | PAGE_FLAGS_USER; - + return pdpt; } else { // PDPT Nicht voranden und soll nicht erstellt werden @@ -185,7 +185,7 @@ static mmc_pd_entry_t* pd_get(mmc_pdpt_entry_t* pdpt, size_t index, memset(pd, 0, PAGE_SIZE); // Das PD wird in der Pagemap eingetragen - pdpt[index] = (qword) phys | PAGE_FLAGS_PRESENT | + pdpt[index] = (mmc_pdpt_entry_t) phys | PAGE_FLAGS_PRESENT | PAGE_FLAGS_WRITABLE | PAGE_FLAGS_USER; return pd; @@ -225,7 +225,7 @@ static mmc_pt_entry_t* pt_get(mmc_pd_entry_t* pd, size_t index, bool create, memset(pt, 0, PAGE_SIZE); // Die PT wird in der Pagemap eingetragen - pd[index] = (qword) phys | PAGE_FLAGS_PRESENT | + pd[index] = (mmc_pd_entry_t) phys | PAGE_FLAGS_PRESENT | PAGE_FLAGS_WRITABLE | PAGE_FLAGS_USER; return pt; @@ -347,7 +347,7 @@ static bool map_page //kprintf("map 0x%16x => 0x%16x\n", vaddr, paddr); bool big_page = FALSE; bool user_page = FALSE; - qword internal_flags = flags; + uint64_t internal_flags = flags; if ((flags & PAGE_FLAGS_BIG) != 0) { big_page = TRUE; @@ -398,14 +398,14 @@ static bool map_page size_t index = PAGE_DIRECTORY_INDEX((uintptr_t) vaddr); if (pd == NULL) { - panic("Doppelbelegung in Page Map. (0x%x)", (qword) vaddr); + panic("Doppelbelegung in Page Map. (0x%lx)", (uintptr_t) vaddr); } if ((pd[index] & 1) == 1) { - panic("Doppelbelegung im Page Directory. (0x%x)", (qword) vaddr); + panic("Doppelbelegung im Page Directory. (0x%lx)", (uintptr_t) vaddr); } - pd[index] = (qword) paddr | internal_flags; + pd[index] = (mmc_pd_entry_t) paddr | internal_flags; pd_free(pd); } else { @@ -416,7 +416,7 @@ static bool map_page // Wenn sie nicht angefordert werden konnte, ist der eintrag im PD // durch eine Grosse Page belegt. if (pt == NULL) { - panic("Doppelbelegung im Page Directory. (0x%x)", (qword) vaddr); + panic("Doppelbelegung im Page Directory. (0x%lx)", (uintptr_t) vaddr); return FALSE; } @@ -431,7 +431,7 @@ static bool map_page } // Wenn alles gut gelaufen ist, wirds jetzt ernst - pt[index] = (qword) paddr | internal_flags; + pt[index] = (mmc_pt_entry_t) paddr | internal_flags; pt_free(pt); } diff --git a/src/kernel2/src/arch/amd64/mm/mm_virt.c b/src/kernel2/src/arch/amd64/mm/mm_virt.c index 9dd4456..544b8cb 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_virt.c +++ b/src/kernel2/src/arch/amd64/mm/mm_virt.c @@ -56,7 +56,7 @@ void vmm_init(mmc_context_t context) { // No execute - Erweiterung aktivieren // Mit cpuid wird geprueft, ob sie ueberhaupt verfügbar ist - dword features = 0; + uint32_t features = 0; asm("movl $0x80000001, %%eax;" "cpuid;" : "=d" (features) : : "eax", "ebx", "ecx"); @@ -69,7 +69,7 @@ void vmm_init(mmc_context_t context) } // Den Kernel mappen - mmc_map(context, kernel_start, kernel_phys_start, MM_FLAGS_KERNEL_CODE, + mmc_map(context, kernel_start, (paddr_t) kernel_phys_start, MM_FLAGS_KERNEL_CODE, NUM_PAGES((uintptr_t) kernel_end - (uintptr_t) kernel_start)); // Videospeicher mappen @@ -83,7 +83,7 @@ void vmm_init(mmc_context_t context) // Bitmap mit dem physischen Speicher mappen. void* phys_mmap = pmm_get_bitmap_start(); size_t phys_mmap_size = pmm_get_bitmap_size(); - phys_mmap = vmm_kernel_automap(phys_mmap, NUM_PAGES(phys_mmap_size)); + phys_mmap = vmm_kernel_automap((paddr_t) phys_mmap, NUM_PAGES(phys_mmap_size)); pmm_set_bitmap_start(phys_mmap); // Auf dem Bootstrap-Prozessor wird das ganze schon eingerichtet. Diese @@ -139,7 +139,7 @@ void vmm_kernel_unmap(vaddr_t start, size_t size) /** * Fuer malloc() */ -void* mem_allocate(dword size, dword flags) +void* mem_allocate(size_t size, int flags) { return vmm_kernel_automap(pmm_alloc(NUM_PAGES(size)), size); } -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:27 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:27 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_05/11=5D_paddr=5Ft_nach_uintptr?= =?utf-8?b?X3QgZ2XDpG5kZXJ0?= In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-5-git-send-email-m.nemo@gmx.net> ! paddr_t: Beschreibt physische Adressen, auf die nicht ohne weiteres zugegriffen werden kann. Es sollte also auf keinen Fall einem normalen void*-Pointer entsprechen. --HG-- rename : src/include/arch/i386/types.h => src/include/types.h extra : rebase_source : 91ece43d76f531dd2fa5a3363ba1866d7f689251 --- Makefile | 8 ++-- src/include/types.h | 2 +- src/kernel/include/kernel.h | 15 +++--- src/kernel/include/phys.h | 6 ++- src/kernel/src/debug.c | 2 +- src/kernel/src/mm/kmm.c | 4 +- src/kernel/src/mm/paging.c | 23 ++++---- src/kernel/src/mm/phys.c | 82 ++++++++++++++-------------- src/kernel/src/modules.c | 19 ++++--- src/kernel/src/rpc.c | 4 +- src/kernel/src/syscall.c | 6 +- src/kernel/src/vm86.c | 14 +++--- src/kernel2/include/arch/i386/mm_arch.h | 3 +- src/kernel2/src/arch/i386/gdt.c | 2 +- src/kernel2/src/arch/i386/mm/mm_context.c | 19 +++---- src/kernel2/src/arch/i386/mm/virt.c | 10 ++-- src/kernel2/src/arch/i386/vm86.c | 6 +- src/kernel2/src/interrupts/apic.c | 2 +- src/kernel2/src/mm/phys.c | 51 ++++++++--------- src/kernel2/src/syscalls/pm.c | 2 +- src/kernel2/src/syscalls/rpc.c | 2 +- src/kernel2/src/tasks/modules.c | 10 ++-- 22 files changed, 147 insertions(+), 145 deletions(-) diff --git a/Makefile b/Makefile index a99b53e..9b89f4a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -include Makefile.local -CC=gcc -m32 -g -c -fno-stack-protector -nostdinc -fno-leading-underscore -fno-omit-frame-pointer -Wall -Werror -Wstrict-prototypes -fno-strict-aliasing -O2 -fno-builtin -I . -CPP=g++ -m32 -g -c -fno-stack-protector -fno-leading-underscore -fno-omit-frame-pointer -Wall -fno-strict-aliasing -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-use-cxa-atexit -O0 +CC=/opt/osdev/bin/i386-elf-gcc -m32 -g -c -fno-stack-protector -nostdinc -fno-leading-underscore -fno-omit-frame-pointer -Wall -Werror -Wstrict-prototypes -fno-strict-aliasing -O2 -fno-builtin -I . +CPP=/opt/osdev/bin/i386-elf-g++ -m32 -g -c -fno-stack-protector -fno-leading-underscore -fno-omit-frame-pointer -Wall -fno-strict-aliasing -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-use-cxa-atexit -O0 PPC=$(PPC_BINARY) -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 @@ -9,7 +9,7 @@ ASM_BIN=nasm -fbin -O99 BUILD_DIR=$(BUILD_ROOT) -AS=as -32 +AS=/opt/osdev/bin/i386-elf-as -32 all: $(MAKE) --no-print-directory -s makefiles @@ -26,7 +26,7 @@ subdirs: $(MAKE) --no-print-directory -sC src clean_objs: - rm -f *.o *.a *.mod *.ppu link.res ppas.sh tyndur + rm -f *.o *.a *.mod *.ppu link.res ppas.sh repo.hg softclean: clean_objs for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" softclean; fi done diff --git a/src/include/types.h b/src/include/types.h index 1ae793f..6ac4653 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -33,7 +33,7 @@ typedef signed long ssize_t; -typedef void * paddr_t; +typedef uintptr_t paddr_t; typedef void * vaddr_t; typedef unsigned int pid_t; diff --git a/src/kernel/include/kernel.h b/src/kernel/include/kernel.h index 6c0c8e4..752112c 100644 --- a/src/kernel/include/kernel.h +++ b/src/kernel/include/kernel.h @@ -4,19 +4,20 @@ //#define COOPERATIVE_MULTITASKING #include +#include __attribute__((noreturn)) void panic(char * message, ...); -void * phys_alloc_page(void); -void * phys_alloc_page_range(unsigned int num); +paddr_t phys_alloc_page(void); +paddr_t phys_alloc_page_range(unsigned int num); -void * phys_alloc_dma_page(void); -void * phys_alloc_dma_page_range(unsigned int num); +paddr_t phys_alloc_dma_page(void); +paddr_t phys_alloc_dma_page_range(unsigned int num); -void * phys_alloc_page_limit(uint32_t lower_limit); +paddr_t phys_alloc_page_limit(uint32_t lower_limit); -void phys_free_page(void * page); -void phys_free_page_range(void * page, unsigned int num); +void phys_free_page(paddr_t page); +void phys_free_page_range(paddr_t page, unsigned int num); extern void kernel_start(void); extern void kernel_phys_start(void); diff --git a/src/kernel/include/phys.h b/src/kernel/include/phys.h index bfbdf2f..7d8e54f 100644 --- a/src/kernel/include/phys.h +++ b/src/kernel/include/phys.h @@ -1,11 +1,13 @@ #ifndef _PHYS_H_ #define _PHYS_H_ -void phys_mark_page_as_free(void * page); +#include + +void phys_mark_page_as_free(paddr_t page); unsigned long phys_count_free_pages(void); unsigned long phys_count_pages(void); -void * phys_alloc_dma_page_range_64k(unsigned int num); +paddr_t phys_alloc_dma_page_range_64k(unsigned int num); #endif diff --git a/src/kernel/src/debug.c b/src/kernel/src/debug.c index a249d5d..34b51c0 100644 --- a/src/kernel/src/debug.c +++ b/src/kernel/src/debug.c @@ -100,7 +100,7 @@ void init_stack_backtrace(void) int i; /* ELF Header mappen */ - map_page_range(kernel_page_directory, elfshdr, elfshdr, + map_page_range(kernel_page_directory, elfshdr, (paddr_t) elfshdr, PTE_W | PTE_P /*| PTE_U*/, NUM_PAGES(multiboot_info.mi_elfshdr_num * sizeof(Elf32_Shdr))); diff --git a/src/kernel/src/mm/kmm.c b/src/kernel/src/mm/kmm.c index 0340b5b..fc38229 100644 --- a/src/kernel/src/mm/kmm.c +++ b/src/kernel/src/mm/kmm.c @@ -244,7 +244,7 @@ vaddr_t alloc_kernel_pages(int num) if(!(kernel_page_tables[i] & PTE_P)) { // Eine neue Page Table muss angelegt werden - kernel_page_tables[i] = (uint32_t)phys_alloc_page() | PTE_W | PTE_P; + kernel_page_tables[i] = phys_alloc_page() | PTE_W | PTE_P; map_kernel_page_table(i, kernel_page_tables[i]); page_table = (page_table_t)(KERNEL_PAGE_TABLES_VADDR + (i << PAGE_SHIFT)); @@ -261,7 +261,7 @@ vaddr_t alloc_kernel_pages(int num) for(j = (i == pgdir_index) ? pgtbl_index : 0; j < PAGE_TABLE_LENGTH && num; j++, num--) { - page_table[j] = (uint32_t)phys_alloc_page() | PTE_W | PTE_P; + page_table[j] = phys_alloc_page() | PTE_W | PTE_P; asm volatile("invlpg %0" : : "m" (*(char*)((i * PAGE_TABLE_LENGTH + j) * PAGE_SIZE)) : "memory"); diff --git a/src/kernel/src/mm/paging.c b/src/kernel/src/mm/paging.c index e5db580..48f9b7e 100644 --- a/src/kernel/src/mm/paging.c +++ b/src/kernel/src/mm/paging.c @@ -89,16 +89,17 @@ void init_paging(void) (uint32_t) kernel_page_directory | PTE_W | PTE_P; // Den Kernel mappen - map_page_range(kernel_page_directory, kernel_start, kernel_phys_start, PTE_W | PTE_P /*| PTE_U*/, ((uint32_t)kernel_end - (uint32_t)kernel_start) / PAGE_SIZE); + map_page_range(kernel_page_directory, kernel_start, (paddr_t) kernel_phys_start, + PTE_W | PTE_P /*| PTE_U*/, ((uint32_t)kernel_end - (uint32_t)kernel_start) / PAGE_SIZE); // Videospeicher mappen - map_page_range(kernel_page_directory, (paddr_t) 0xB8000, (vaddr_t)0xB8000, PTE_W | PTE_P /*| PTE_U*/, ((25*80*2) / PAGE_SIZE) + 1); + map_page_range(kernel_page_directory, (vaddr_t) 0xB8000, (paddr_t)0xB8000, PTE_W | PTE_P /*| PTE_U*/, ((25*80*2) / PAGE_SIZE) + 1); /* Das Page Directory mappen */ - map_page(kernel_page_directory, kernel_page_directory, kernel_page_directory, PTE_P | PTE_W); + map_page(kernel_page_directory, kernel_page_directory, (paddr_t)kernel_page_directory, PTE_P | PTE_W); // Bitmap mit dem physischen Speicher mappen. - map_page_range(kernel_page_directory, phys_mmap, phys_mmap, PTE_W | PTE_P, + map_page_range(kernel_page_directory, phys_mmap, (paddr_t)phys_mmap, PTE_W | PTE_P, (sizeof(uint32_t) * phys_mmap_size + PAGE_SIZE - 1) / PAGE_SIZE); __asm__( @@ -210,7 +211,7 @@ bool map_page(page_directory_t page_directory, vaddr_t vaddr, paddr_t paddr, int // ihre Adresse zugreifen, wenn man nicht gerade einen Page Fault auslösen will. // Die Page Table muss daher zunächst in den Kerneladressraum gemappt werden. vaddr_t kernel_page_table = find_contiguous_kernel_pages(1); - map_page(kernel_page_directory, kernel_page_table, page_table, PTE_P | PTE_W); + map_page(kernel_page_directory, kernel_page_table, (paddr_t) page_table, PTE_P | PTE_W); /* kprintf("Mappe PT in Kerneladressraum; neue PT\n"); @@ -244,7 +245,7 @@ bool map_page(page_directory_t page_directory, vaddr_t vaddr, paddr_t paddr, int // Die Page Table muss daher zunächst in den Kerneladressraum gemappt werden. vaddr_t kernel_page_table = find_contiguous_kernel_pages(1); - map_page(kernel_page_directory, kernel_page_table, page_table, PTE_P | PTE_W); + map_page(kernel_page_directory, kernel_page_table, (paddr_t) page_table, PTE_P | PTE_W); page_table = kernel_page_table; } } @@ -291,7 +292,7 @@ bool map_page(page_directory_t page_directory, vaddr_t vaddr, paddr_t paddr, int */ bool unmap_page(page_directory_t page_directory, vaddr_t vaddr) { - return map_page(page_directory, vaddr, NULL, 0); + return map_page(page_directory, vaddr, (paddr_t) NULL, 0); } /** @@ -322,7 +323,7 @@ static uint32_t get_pagetable_entry } else if (page_directory[vpage / PAGE_TABLE_LENGTH] & PTE_PS) { return page_directory[vpage / PAGE_TABLE_LENGTH]; } else { - phys_page_table = (page_table_t) + phys_page_table = (paddr_t) (page_directory[vpage / PAGE_TABLE_LENGTH] & ~0xFFF); } @@ -355,7 +356,7 @@ paddr_t resolve_vaddr(page_directory_t page_directory, vaddr_t vaddr) uint32_t pte = get_pagetable_entry(page_directory, vaddr); if ((pte & PTE_P) == 0) { - return NULL; + return (paddr_t) NULL; } if ((pte & PTE_PS) == 0) { @@ -416,7 +417,7 @@ vaddr_t find_contiguous_pages(page_directory_t page_directory, int num, uint32_t page_table_t page_table; vaddr_t kernel_page_table = find_contiguous_kernel_pages(1); - map_page(kernel_page_directory, kernel_page_table, (vaddr_t) (page_directory[cur_page_table] & PAGE_MASK), PTE_P | PTE_W); + map_page(kernel_page_directory, kernel_page_table, page_directory[cur_page_table] & PAGE_MASK, PTE_P | PTE_W); page_table = kernel_page_table; while (cur_page < PAGE_TABLE_LENGTH) { @@ -459,7 +460,7 @@ void increase_user_stack_size(struct task * task_ptr, int pages) for(i = 0; i < pages; i++) { task_ptr->user_stack_bottom -= PAGE_SIZE; - if(resolve_vaddr((page_directory_t) task_ptr->cr3, (vaddr_t) task_ptr->user_stack_bottom) != NULL) + if(resolve_vaddr((page_directory_t) task_ptr->cr3, (vaddr_t) task_ptr->user_stack_bottom) != (paddr_t) NULL) { kprintf("\n" "\033[1;37m\033[41m" // weiss auf rot diff --git a/src/kernel/src/mm/phys.c b/src/kernel/src/mm/phys.c index 9d4fea6..f0154da 100644 --- a/src/kernel/src/mm/phys.c +++ b/src/kernel/src/mm/phys.c @@ -95,10 +95,10 @@ unsigned long phys_count_pages() * @param page Zeiger auf den Anfang der Page die als frei markiert werden soll. */ -void phys_mark_page_as_free(void * page) +void phys_mark_page_as_free(paddr_t page) { // kprintf("[Free %08x]", page); - phys_mmap[(unsigned int)page / PAGE_SIZE / 32] |= 1 << (((unsigned int)page / PAGE_SIZE) & 31); + phys_mmap[page / PAGE_SIZE / 32] |= 1 << ((page / PAGE_SIZE) & 31); } /** @@ -108,13 +108,13 @@ void phys_mark_page_as_free(void * page) * @param num Anzahl der Pages die als frei markiert werden sollen. */ -void phys_mark_page_range_as_free(void * page, unsigned int num) +void phys_mark_page_range_as_free(paddr_t page, unsigned int num) { int i; for(i = 0; i < num; i++) { - phys_mark_page_as_free((void*)((char*)page + i * PAGE_SIZE)); + phys_mark_page_as_free(page + i * PAGE_SIZE); } } @@ -124,9 +124,9 @@ void phys_mark_page_range_as_free(void * page, unsigned int num) * @param page Zeiger auf den Anfang der Page die als benutzt markiert werden soll. */ -void phys_mark_page_as_used(void * page) +void phys_mark_page_as_used(paddr_t page) { - phys_mmap[(unsigned int)page / PAGE_SIZE / 32] &= ~(1 << (((unsigned int)page / PAGE_SIZE) & 31)); + phys_mmap[page / PAGE_SIZE / 32] &= ~(1 << ((page / PAGE_SIZE) & 31)); } /** @@ -136,13 +136,13 @@ void phys_mark_page_as_used(void * page) * @param num Anzahl der Pages die als benutzt markiert werden sollen. */ -void phys_mark_page_range_as_used(void * page, unsigned int num) +void phys_mark_page_range_as_used(paddr_t page, unsigned int num) { int i; for(i = 0; i < num; i++) { - phys_mark_page_as_used((void*)((char*)page + i * PAGE_SIZE)); + phys_mark_page_as_used(page + i * PAGE_SIZE); } } @@ -156,16 +156,16 @@ void phys_mark_page_range_as_used(void * page, unsigned int num) * durch PAGE_SIZE teilbar). Im Fehlerfall wird 1 zurückgegeben. */ -void * find_free_page(unsigned long lower_limit) +paddr_t find_free_page(unsigned long lower_limit) { unsigned int i, j; - void * page = 0; - + paddr_t page = 0; + i = lower_limit / PAGE_SIZE / 32; if(phys_mmap[i] & (0xffffffff << ((lower_limit / PAGE_SIZE) % 32))) { j = bit_scan_forward(phys_mmap[i] & (0xffffffff << ((lower_limit / PAGE_SIZE) % 32))); - page = (void*)((i * 32 + j) * PAGE_SIZE); + page = (i * 32 + j) * PAGE_SIZE; return page; } @@ -174,12 +174,12 @@ void * find_free_page(unsigned long lower_limit) if(phys_mmap[i]) { j = bit_scan_forward(phys_mmap[i]); - page = (void*)((i * 32 + j) * PAGE_SIZE); + page = (i * 32 + j) * PAGE_SIZE; return page; } } - return (void *) 1; + return 1; } /** @@ -196,11 +196,11 @@ void * find_free_page(unsigned long lower_limit) */ /* TODO: unbedingt testen */ -void * find_free_page_range(unsigned long lower_limit, unsigned int num) +paddr_t find_free_page_range(unsigned long lower_limit, unsigned int num) { unsigned int i, j; unsigned int found = 0; - void * page = 0; + paddr_t page = 0; for(i = lower_limit / PAGE_SIZE / 32; i < phys_mmap_size; i++) { @@ -214,7 +214,7 @@ void * find_free_page_range(unsigned long lower_limit, unsigned int num) { if(found == 0) { - page = (void*)(i * 32 * PAGE_SIZE); + page = i * 32 * PAGE_SIZE; } found += 32; } @@ -226,7 +226,7 @@ void * find_free_page_range(unsigned long lower_limit, unsigned int num) { if(found == 0) { - page = (void*)((i * 32 + j) * PAGE_SIZE); + page = (i * 32 + j) * PAGE_SIZE; } found++; @@ -248,7 +248,7 @@ void * find_free_page_range(unsigned long lower_limit, unsigned int num) } } - return (void*) 1; + return 1; } /** @@ -257,7 +257,7 @@ void * find_free_page_range(unsigned long lower_limit, unsigned int num) * @param page Zeiger auf den Anfang der Page die als frei markiert werden soll. */ -void phys_free_page(void * page) +void phys_free_page(paddr_t page) { phys_mark_page_as_free(page); } @@ -269,7 +269,7 @@ void phys_free_page(void * page) * @param num Anzahl der Pages die als frei markiert werden sollen. */ -void phys_free_page_range(void * page, unsigned int num) +void phys_free_page_range(paddr_t page, unsigned int num) { phys_mark_page_range_as_free(page, num); } @@ -280,10 +280,10 @@ void phys_free_page_range(void * page, unsigned int num) * @return Zeiger auf den Anfang der DMA-Page. */ -void * phys_alloc_dma_page() +paddr_t phys_alloc_dma_page() { - void * page = find_free_page(0); - if((uint32_t) page & (PAGE_SIZE - 1)) + paddr_t page = find_free_page(0); + if(page & (PAGE_SIZE - 1)) { panic("Kein freier Speicher mehr da."); } @@ -297,10 +297,10 @@ void * phys_alloc_dma_page() * @return Zeiger auf den Anfang der Page. */ -void * phys_alloc_page() +paddr_t phys_alloc_page() { - void * page = find_free_page(16 * 1024 * 1024); - if((uint32_t) page & (PAGE_SIZE - 1)) + paddr_t page = find_free_page(16 * 1024 * 1024); + if(page & (PAGE_SIZE - 1)) { return phys_alloc_dma_page(); } @@ -311,15 +311,15 @@ void * phys_alloc_page() /** * Reserviert eine Page nicht unterhalb einer gegebenen Adresse */ -void * phys_alloc_page_limit(uint32_t lower_limit) +paddr_t phys_alloc_page_limit(uint32_t lower_limit) { - void * page = find_free_page(16 * 1024 * 1024 > lower_limit ? 16 * 1024 * 1024 : lower_limit); + paddr_t page = find_free_page(16 * 1024 * 1024 > lower_limit ? 16 * 1024 * 1024 : lower_limit); - if((uint32_t) page & (PAGE_SIZE - 1)) { + if(page & (PAGE_SIZE - 1)) { page = find_free_page(lower_limit); } - if((uint32_t) page & (PAGE_SIZE - 1)) { + if(page & (PAGE_SIZE - 1)) { panic("Konnte Speicher nicht reservieren"); } phys_mark_page_as_used(page); @@ -333,9 +333,9 @@ void * phys_alloc_page_limit(uint32_t lower_limit) * @return Zeiger auf den Anfang der ersten Page. */ -void * phys_alloc_dma_page_range(unsigned int num) +paddr_t phys_alloc_dma_page_range(unsigned int num) { - void * page = find_free_page_range(0, num); + paddr_t page = find_free_page_range(0, num); if((uint32_t) page & (PAGE_SIZE - 1)) { panic("Keine freier Speicher mehr da."); @@ -350,9 +350,9 @@ void * phys_alloc_dma_page_range(unsigned int num) * @return Zeiger auf den Anfang der ersten Page. */ -void * phys_alloc_page_range(unsigned int num) +paddr_t phys_alloc_page_range(unsigned int num) { - void * page = find_free_page_range(16 * 1024 * 1024, num); + paddr_t page = find_free_page_range(16 * 1024 * 1024, num); if((uint32_t) page & (PAGE_SIZE - 1)) { return phys_alloc_dma_page_range(num); @@ -367,16 +367,16 @@ void * phys_alloc_page_range(unsigned int num) * @return Zeiger auf den Anfang der ersten Page. */ -void * phys_alloc_dma_page_range_64k(unsigned int num) +paddr_t phys_alloc_dma_page_range_64k(unsigned int num) { uint32_t pos = 0; - void* page; + paddr_t page; - while(1) + while(1) { page = find_free_page_range(pos, num); - if((uint32_t) page & (PAGE_SIZE - 1)) + if(page & (PAGE_SIZE - 1)) { panic("Keine freier Speicher mehr da."); } @@ -588,12 +588,12 @@ void init_phys_mem(vaddr_t mmap_addr, uint32_t mmap_length, uint32_t upper_mem) } /* alle seiten als belegt markieren */ - phys_mark_page_range_as_used((void*)0, upper_end / PAGE_SIZE); + phys_mark_page_range_as_used(0, upper_end / PAGE_SIZE); /* freie seiten als frei markieren */ for(i = 0; i < memblocks_count; i++) { //kprintf("Mark as free: %x, %d Pages\n", available_memory[i].start, (available_memory[i].end - available_memory[i].start) / PAGE_SIZE); - phys_mark_page_range_as_free((void*)available_memory[i].start, (available_memory[i].end - available_memory[i].start) / PAGE_SIZE); + phys_mark_page_range_as_free(available_memory[i].start, (available_memory[i].end - available_memory[i].start) / PAGE_SIZE); } } diff --git a/src/kernel/src/modules.c b/src/kernel/src/modules.c index 2eeeb92..d05b10b 100644 --- a/src/kernel/src/modules.c +++ b/src/kernel/src/modules.c @@ -90,10 +90,11 @@ void load_init_module(struct multiboot_info * multiboot_info) } //Befehlszeile des Moduls mappen - char* cmdline = map_phys_addr(multiboot_module->cmdline, 4096); + char* cmdline = map_phys_addr((paddr_t) multiboot_module->cmdline, 4096); //Das Modul dem ELF-Loader uebergeben - void* elf_image = map_phys_addr(multiboot_module->start, multiboot_module->end - multiboot_module->start); + void* elf_image = map_phys_addr((paddr_t) multiboot_module->start, + multiboot_module->end - multiboot_module->start); load_single_module(elf_image, cmdline); free_phys_addr(elf_image, multiboot_module->end - multiboot_module->start); @@ -132,17 +133,17 @@ void load_multiboot_modules(struct multiboot_info * multiboot_info) multiboot_module_phys = multiboot_info->mi_mods_addr; // Speicher für die Modulparameter - char* mod_cmdline_page = phys_alloc_page(); + paddr_t mod_cmdline_page_phys = phys_alloc_page(); void* mod_cmdline_task = find_contiguous_pages((page_directory_t)first_task->cr3, 1, USER_MEM_START, USER_MEM_END); - map_page((page_directory_t)first_task->cr3, mod_cmdline_task, mod_cmdline_page, PTE_P | PTE_U | PTE_W); + map_page((page_directory_t)first_task->cr3, mod_cmdline_task, mod_cmdline_page_phys, PTE_P | PTE_U | PTE_W); - mod_cmdline_page = map_phys_addr(mod_cmdline_page, PAGE_SIZE); + char* mod_cmdline_page = map_phys_addr(mod_cmdline_page_phys, PAGE_SIZE); char* mod_cmdline = mod_cmdline_page; size_t mod_cmdline_free = PAGE_SIZE; //Speicher für die Modulliste allokieren und void* mod_list_task = find_contiguous_pages((page_directory_t)first_task->cr3, 1, USER_MEM_START, USER_MEM_END); - void* mod_list_phys = phys_alloc_page(); + paddr_t mod_list_phys = phys_alloc_page(); map_page((page_directory_t)first_task->cr3, mod_list_task, mod_list_phys, PTE_P | PTE_U | PTE_W); @@ -168,7 +169,7 @@ void load_multiboot_modules(struct multiboot_info * multiboot_info) //Freie virtuelle Adresse suchen um das Modul dort hin zu mappen. void* dest = find_contiguous_pages((page_directory_t)first_task->cr3, pages, USER_MEM_START, USER_MEM_END); - map_page_range((page_directory_t)first_task->cr3, dest, multiboot_module->start, PTE_P | PTE_U | PTE_W, pages); + map_page_range((page_directory_t)first_task->cr3, dest, (paddr_t) multiboot_module->start, PTE_P | PTE_U | PTE_W, pages); first_task->memory_used += pages * 0x1000; //TODO: Den Speicher aus dem Kerneladressraum unmappen @@ -179,7 +180,7 @@ void load_multiboot_modules(struct multiboot_info * multiboot_info) modulelist[3 + (3*i)] = (uint32_t) mod_cmdline_task + (mod_cmdline - mod_cmdline_page); // Modellbefehlszeile kopieren - char* cmdline = map_phys_addr(multiboot_module->cmdline, 4096); + char* cmdline = map_phys_addr((paddr_t) multiboot_module->cmdline, 4096); size_t length = strlen(cmdline); if (mod_cmdline_free > length) { strncpy(mod_cmdline, cmdline, length); @@ -356,7 +357,7 @@ void load_single_module(Elf32_Ehdr * elf_header, const char* cmdline) #endif memset(dst, 0, 0x1000); - free_phys_addr(phys_dst, 0x1000); + free_phys_addr((vaddr_t)phys_dst, 0x1000); } #ifdef DEBUG diff --git a/src/kernel/src/rpc.c b/src/kernel/src/rpc.c index 22863e3..45887e1 100644 --- a/src/kernel/src/rpc.c +++ b/src/kernel/src/rpc.c @@ -165,8 +165,8 @@ bool fastrpc(struct task * callee, uint32_t metadata_size, void* metadata, pages_count++; } - if(resolve_vaddr((page_directory_t) callee->cr3, - (vaddr_t) callee_isf->esp - rounded_data_size) == NULL) + if(resolve_vaddr((page_directory_t) callee->cr3, + (vaddr_t) callee_isf->esp - rounded_data_size) == (paddr_t) NULL) { // TODO Das könnte bis zu (pages_count - 1) Pages zu viel reservieren increase_user_stack_size(callee, pages_count); diff --git a/src/kernel/src/syscall.c b/src/kernel/src/syscall.c index 89a2935..5161f84 100644 --- a/src/kernel/src/syscall.c +++ b/src/kernel/src/syscall.c @@ -148,7 +148,7 @@ void syscall(struct int_stack_frame ** esp) while(num--) { paddr = phys_alloc_page(); - *phys = NULL; + *phys = (paddr_t) NULL; if (!map_page((page_directory_t) current_task->cr3, vaddr, paddr, PTE_P | PTE_U | PTE_W)) { @@ -230,7 +230,7 @@ void syscall(struct int_stack_frame ** esp) } else { - phys_mark_page_as_free((void*) paddress); + phys_mark_page_as_free(paddress); } address += PAGE_SIZE; @@ -426,7 +426,7 @@ void syscall(struct int_stack_frame ** esp) map_page(new_task_pd, dest, phys_alloc_page(), PTE_P | PTE_U | PTE_W); } - void *phys_addr = resolve_vaddr(new_task_pd, dest); + paddr_t phys_addr = resolve_vaddr(new_task_pd, dest); char *destmem = find_contiguous_kernel_pages(1); map_page(kernel_page_directory, destmem, phys_addr, PTE_P | PTE_W); memcpy(destmem, src, 0x1000); diff --git a/src/kernel/src/vm86.c b/src/kernel/src/vm86.c index 08aec99..be50e39 100644 --- a/src/kernel/src/vm86.c +++ b/src/kernel/src/vm86.c @@ -157,8 +157,8 @@ struct task * create_vm86_task(uint16_t interrupt, vm86_regs_t *regs, uint32_t * new_task->cr3 = pagedir; pagedir[0] |= 0x4; - map_page_range(kernel_page_directory, (paddr_t)0xC0000, (vaddr_t)0xC0000, PTE_P | PTE_U, 0x40); - map_page_range(kernel_page_directory, (paddr_t)0xA0000, (vaddr_t)0xA0000, PTE_W | PTE_P | PTE_U, 0x10); + map_page_range(kernel_page_directory, (vaddr_t)0xC0000, (paddr_t)0xC0000, PTE_P | PTE_U, 0x40); + map_page_range(kernel_page_directory, (vaddr_t)0xA0000, (paddr_t)0xA0000, PTE_W | PTE_P | PTE_U, 0x10); // Speicher fuer die Stacks allokieren @@ -284,13 +284,13 @@ bool vm86_exception(uint32_t *esp) vm86_info_t *info = task->vm86_info; // Speicher kopieren if (info->meminfo) { - uint32_t *phys_meminfo = resolve_vaddr(task->parent_task->cr3, (uint32_t*)((uint32_t)info->meminfo & ~0xFFF)); + paddr_t phys_meminfo = resolve_vaddr(task->parent_task->cr3, (uint32_t*)((uint32_t)info->meminfo & ~0xFFF)); uint32_t *meminfo = (uint32_t*)find_contiguous_kernel_pages(1); map_page(kernel_page_directory, meminfo, phys_meminfo, PTE_P | PTE_W); meminfo = (uint32_t*)(((uint32_t)meminfo) + ((uint32_t)info->meminfo & 0xFFF)); uint32_t i; for (i = 0; i < meminfo[0]; i++) { - uint32_t *phys_mem = resolve_vaddr(task->parent_task->cr3, (uint32_t*)((uint32_t)meminfo[1 + i * 3 + 1] & ~0xFFF)); + paddr_t phys_mem = resolve_vaddr(task->parent_task->cr3, (uint32_t*)((uint32_t)meminfo[1 + i * 3 + 1] & ~0xFFF)); uint32_t *mem = (uint32_t*)find_contiguous_kernel_pages(1); map_page(kernel_page_directory, mem, phys_mem, PTE_P | PTE_W); memcpy((void*)((uint32_t)mem + (meminfo[1 + i * 3 + 1] & 0xFFF)), (void*)meminfo[1 + i * 3], meminfo[1 + i * 3 + 2]); @@ -300,7 +300,7 @@ bool vm86_exception(uint32_t *esp) unmap_page(kernel_page_directory, (uint32_t*)((uint32_t)meminfo & ~0xFFF)); } // Register speichern - uint32_t *phys_regs = resolve_vaddr(task->parent_task->cr3, (uint32_t*)((uint32_t)info->regs & ~0xFFF)); + paddr_t phys_regs = resolve_vaddr(task->parent_task->cr3, (uint32_t*)((uint32_t)info->regs & ~0xFFF)); uint32_t regs = (uint32_t) map_phys_addr(phys_regs, PAGE_SIZE); vm86_regs_t * vm86_regs = (vm86_regs_t *)(regs + ((uint32_t)info->regs & 0xFFF)); vm86_regs->ax = isf->eax; @@ -311,13 +311,13 @@ bool vm86_exception(uint32_t *esp) vm86_regs->di = isf->edi; vm86_regs->ds = ((uint32_t*)(isf + 1))[0]; vm86_regs->es = ((uint32_t*)(isf + 1))[1]; - free_phys_addr((void*) regs, PAGE_SIZE); + free_phys_addr((vaddr_t) regs, PAGE_SIZE); // Speicher freigeben // - Stack unmap_page(task->cr3, (vaddr_t)0x90000); // - BIOS-Daten uint32_t *page_table = (uint32_t*)find_contiguous_kernel_pages(1); - map_page(kernel_page_directory, page_table, (uint32_t*)(((uint32_t*)task->cr3)[0] & ~0xFFF), PTE_P | PTE_W); + map_page(kernel_page_directory, page_table, (((uint32_t*)task->cr3)[0] & ~0xFFF), PTE_P | PTE_W); page_table[0] = 0; unmap_page(kernel_page_directory, page_table); // - BIOS diff --git a/src/kernel2/include/arch/i386/mm_arch.h b/src/kernel2/include/arch/i386/mm_arch.h index ef01a25..cac9e9b 100644 --- a/src/kernel2/include/arch/i386/mm_arch.h +++ b/src/kernel2/include/arch/i386/mm_arch.h @@ -37,6 +37,7 @@ #define _MM_ARCH_H_ #include +#include #include #include #include "multiboot.h" @@ -59,7 +60,7 @@ typedef unsigned long* page_directory_t; typedef struct { uint32_t version; - page_directory_t page_directory; + paddr_t page_directory; page_directory_t page_directory_virt; lock_t lock; } mmc_context_t; diff --git a/src/kernel2/src/arch/i386/gdt.c b/src/kernel2/src/arch/i386/gdt.c index 4b85a7a..9d5b591 100644 --- a/src/kernel2/src/arch/i386/gdt.c +++ b/src/kernel2/src/arch/i386/gdt.c @@ -118,7 +118,7 @@ void gdt_init(void) void gdt_init_local(void) { int i; - void* pagetable; + paddr_t pagetable; lock(&gdt_lock); // Deskriptor fuer das Task state segment anlegen diff --git a/src/kernel2/src/arch/i386/mm/mm_context.c b/src/kernel2/src/arch/i386/mm/mm_context.c index 22a58e5..f810fa0 100644 --- a/src/kernel2/src/arch/i386/mm/mm_context.c +++ b/src/kernel2/src/arch/i386/mm/mm_context.c @@ -100,10 +100,10 @@ mmc_context_t mmc_create_kernel_context() { mmc_context_t context; // Das Page Directory initialisieren - page_directory_t page_directory = pmm_alloc(1); + page_directory_t page_directory = (page_directory_t) pmm_alloc(1); context.lock = LOCK_UNLOCKED; - context.page_directory = page_directory; + context.page_directory = (paddr_t) page_directory; context.page_directory_virt = page_directory; context.version = page_directory_version; @@ -216,7 +216,7 @@ static inline vaddr_t get_pagetable(mmc_context_t* context, size_t index) } } else { page_table = vmm_kernel_automap - ((vaddr_t) (pagedir[index] & PAGE_MASK), PAGE_SIZE); + ((paddr_t) (pagedir[index] & PAGE_MASK), PAGE_SIZE); } return page_table; @@ -429,7 +429,7 @@ bool mmc_unmap(mmc_context_t* context, vaddr_t vaddr, size_t count) size_t i; for (i = 0; i < count; i++) { - if (!map_page(context, vaddr + i * PAGE_SIZE, NULL, 0)) { + if (!map_page(context, vaddr + i * PAGE_SIZE, (paddr_t) NULL, 0)) { return false; } } @@ -458,7 +458,7 @@ paddr_t mmc_resolve(mmc_context_t* context, vaddr_t vaddr) // Bei einer 4M-Page sind wir eigentlich schon am Ziel if ((page_directory[vpage / PAGE_TABLE_LENGTH] & PTE_P) == 0) { - return NULL; + return (paddr_t) NULL; } else if (page_directory[vpage / PAGE_TABLE_LENGTH] & PTE_PS) { @@ -469,8 +469,7 @@ paddr_t mmc_resolve(mmc_context_t* context, vaddr_t vaddr) } else { - phys_page_table = (page_table_t) - (page_directory[vpage / PAGE_TABLE_LENGTH] & ~0xFFF); + phys_page_table = (page_directory[vpage / PAGE_TABLE_LENGTH] & ~0xFFF); } // Die Page-Table-Adresse ist eine physische Adresse. Am sichersten ist es, @@ -485,7 +484,7 @@ paddr_t mmc_resolve(mmc_context_t* context, vaddr_t vaddr) | ((uint32_t) vaddr & 0xFFF)); } else { - result = NULL; + result = (paddr_t) NULL; } // Falls wir die Page Table extra in den Kerneladressraum gemappt haben, @@ -716,10 +715,10 @@ inline vaddr_t mmc_valloc_limits(mmc_context_t* context, size_t num_pages, vaddr_t mmc_valloc(mmc_context_t* context, size_t num_pages, int flags) { if (flags & PTE_U) { - return mmc_valloc_limits(context, num_pages, NULL, NULL, + return mmc_valloc_limits(context, num_pages, 0, 0, MM_USER_START, MM_USER_END, flags); } else { - return mmc_valloc_limits(context, num_pages, NULL, NULL, + return mmc_valloc_limits(context, num_pages, 0, 0, KERNEL_MEM_START, KERNEL_MEM_END, flags); } } diff --git a/src/kernel2/src/arch/i386/mm/virt.c b/src/kernel2/src/arch/i386/mm/virt.c index a656a1a..c0181fa 100644 --- a/src/kernel2/src/arch/i386/mm/virt.c +++ b/src/kernel2/src/arch/i386/mm/virt.c @@ -57,10 +57,10 @@ void vmm_init(mmc_context_t* kernel_context) // TODO: 4M-Pages benutzen, wenn in config.h aktiviert // Den Kernel mappen - mmc_map(kernel_context, kernel_start, kernel_phys_start, PTE_P, + mmc_map(kernel_context, kernel_start, (paddr_t) kernel_phys_start, PTE_P, NUM_PAGES(rosize)); mmc_map(kernel_context, kernel_start + rosize, - kernel_phys_start + rosize, PTE_P | PTE_W, NUM_PAGES(rwsize)); + (paddr_t) kernel_phys_start + rosize, PTE_P | PTE_W, NUM_PAGES(rwsize)); // Videospeicher mappen // TODO Usermodus muss die momentan wegen VM86 sehen. Waere wohl besser, @@ -81,7 +81,7 @@ void vmm_init(mmc_context_t* kernel_context) // Hier daft _NICHT vmm_kernel_automap_ benutzt werden, da use_phys_addr // hier noch true ist. - phys_mmap = mmc_automap(kernel_context, phys_mmap, + phys_mmap = mmc_automap(kernel_context, (paddr_t) phys_mmap, NUM_PAGES(phys_mmap_size), KERNEL_MEM_START, KERNEL_MEM_END, PTE_P | PTE_W); pmm_set_bitmap_start(phys_mmap); @@ -129,7 +129,7 @@ void vmm_init_local(mmc_context_t* kernel_context) vaddr_t vmm_kernel_automap(paddr_t start, size_t size) { if (use_phys_addr == true) { - return start; + return (vaddr_t) start; } else { return (vaddr_t) ((uintptr_t) mmc_automap(&mmc_current_context(), (paddr_t) ((uintptr_t) start & PAGE_MASK), NUM_PAGES(size), @@ -173,7 +173,7 @@ void increase_user_stack_size(pm_thread_t* thread, int pages) { thread->user_stack_bottom -= PAGE_SIZE; if(mmc_resolve(&thread->process->context, - (vaddr_t) thread->user_stack_bottom) != NULL) + (vaddr_t) thread->user_stack_bottom) != (paddr_t) NULL) { /* kprintf("\n" diff --git a/src/kernel2/src/arch/i386/vm86.c b/src/kernel2/src/arch/i386/vm86.c index ce216e8..3594378 100644 --- a/src/kernel2/src/arch/i386/vm86.c +++ b/src/kernel2/src/arch/i386/vm86.c @@ -88,7 +88,7 @@ static struct { static struct { bool in_use; void* stack; - void* nullpage; + paddr_t nullpage; uint32_t* memory; pm_thread_t* caller; vm86_regs_t* regs; @@ -187,13 +187,13 @@ int arch_vm86(uint8_t intr, void* regs, uint32_t* memory) // Nullpage mappen uint32_t* page_table = (uint32_t*) PAGETABLES_MEM_START; - void* nullpage = pmm_alloc(1); + paddr_t nullpage = pmm_alloc(1); page_table[0] = (uintptr_t) nullpage | PTE_U | PTE_W | PTE_P; asm volatile("invlpg %0" :: "m" (*(char*)0x0)); memcpy(0, &bios_data, 4096); // Stack mappen - void* stack = mmc_valloc_limits(&mmc_current_context(), 1, NULL, NULL, + void* stack = mmc_valloc_limits(&mmc_current_context(), 1, 0, 0, 0x0, 0x9fc00, PTE_U | PTE_W | PTE_P); if (stack == NULL) { kprintf("vm86: Kein Platz fuer den Stack\n"); diff --git a/src/kernel2/src/interrupts/apic.c b/src/kernel2/src/interrupts/apic.c index 924a165..c606a12 100644 --- a/src/kernel2/src/interrupts/apic.c +++ b/src/kernel2/src/interrupts/apic.c @@ -101,7 +101,7 @@ void apic_init() if (apic_base_virt == 0) { apic_base_phys = (paddr_t) (uintptr_t) (cpu_read_msr(APIC_BASE_MSR) & (~0xFFF)); - apic_base_virt = apic_base_phys; + apic_base_virt = (vaddr_t) apic_base_phys; } // Jetzt wird der APIC aktiviert diff --git a/src/kernel2/src/mm/phys.c b/src/kernel2/src/mm/phys.c index 8717c7b..305041e 100644 --- a/src/kernel2/src/mm/phys.c +++ b/src/kernel2/src/mm/phys.c @@ -127,7 +127,7 @@ size_t pmm_count_pages() * soll. */ -static inline void phys_mark_page_as_free(void* page) +static inline void phys_mark_page_as_free(paddr_t page) { //lock(&pmm_lock); size_t bitmap_index = (size_t) page / PAGE_SIZE / PMM_BITS_PER_ELEMENT; @@ -144,7 +144,7 @@ static inline void phys_mark_page_as_free(void* page) * @param num Anzahl der Pages die als frei markiert werden sollen. */ -static inline void phys_mark_page_range_as_free(void* page, size_t num) +static inline void phys_mark_page_range_as_free(paddr_t page, size_t num) { size_t i; @@ -160,7 +160,7 @@ static inline void phys_mark_page_range_as_free(void* page, size_t num) * soll. */ -static inline void phys_mark_page_as_used(void* page) +static inline void phys_mark_page_as_used(paddr_t page) { //lock(&pmm_lock); size_t bitmap_index = (size_t) page / PAGE_SIZE / PMM_BITS_PER_ELEMENT; @@ -176,7 +176,7 @@ static inline void phys_mark_page_as_used(void* page) * @param num Anzahl der Pages die als benutzt markiert werden sollen. */ -static inline void phys_mark_page_range_as_used(void* page, size_t num) +static inline void phys_mark_page_range_as_used(paddr_t page, size_t num) { size_t i; @@ -200,12 +200,12 @@ static inline void phys_mark_page_range_as_used(void* page, size_t num) */ /* TODO: unbedingt testen */ -static void* find_free_page_range +static paddr_t find_free_page_range (size_t lower_index, size_t upper_index, size_t num) { size_t i, j; size_t found = 0; - void* page = 0; + paddr_t page = 0; for(i = lower_index; i < upper_index; i++) { @@ -218,7 +218,7 @@ static void* find_free_page_range { if(found == 0) { - page = (void*)(i * PMM_BITS_PER_ELEMENT * PAGE_SIZE); + page = i * PMM_BITS_PER_ELEMENT * PAGE_SIZE; } found += PMM_BITS_PER_ELEMENT; } @@ -229,8 +229,7 @@ static void* find_free_page_range if(pmm_bitmap[i] & (1 << j)) { if(found == 0) { - page = (void*) - ((i * PMM_BITS_PER_ELEMENT + j) * PAGE_SIZE); + page = (i * PMM_BITS_PER_ELEMENT + j) * PAGE_SIZE; } found++; @@ -250,7 +249,7 @@ static void* find_free_page_range } } - return (void*) 1; + return 1; } @@ -314,8 +313,8 @@ paddr_t pmm_alloc_limits(paddr_t lower_limit, paddr_t upper_limit, size_t num) paddr_t pmm_alloc(size_t num) { paddr_t result = pmm_alloc_limits( - 0, - (void*) (pmm_bitmap_length * PMM_BITS_PER_ELEMENT * PAGE_SIZE), + 0, + pmm_bitmap_length * PMM_BITS_PER_ELEMENT * PAGE_SIZE, num ); @@ -410,16 +409,16 @@ static struct mem_block get_reserved_block // Bitmap nur beruecksichtigen, wenn sie bereits zugewiesen ist if (bitmap && (i-- == 0)) { - result.start = pmm_bitmap; - result.end = pmm_bitmap + - ((pmm_bitmap_length / 8) * PMM_BITS_PER_ELEMENT); + result.start = (paddr_t) pmm_bitmap; + result.end = (paddr_t) + (pmm_bitmap + ((pmm_bitmap_length / 8) * PMM_BITS_PER_ELEMENT)); return result; } // Der Kernel ist besetzt if (i-- == 0) { - result.start = kernel_phys_start; - result.end = kernel_phys_end; + result.start = (paddr_t) kernel_phys_start; + result.end = (paddr_t) kernel_phys_end; return result; } @@ -434,26 +433,24 @@ static struct mem_block get_reserved_block { // Die Multiboot-Info zum Modul if (i-- == 0) { - result.start = multiboot_module; - result.end = multiboot_module + 1; + result.start = (paddr_t) multiboot_module; + result.end = (paddr_t) (multiboot_module + 1); return result; } // Das Modul selbst if (i-- == 0) { - result.start = (paddr_t) (uintptr_t) multiboot_module->start; - result.end = (paddr_t) (uintptr_t) multiboot_module->end; + result.start = (paddr_t) multiboot_module->start; + result.end = (paddr_t) multiboot_module->end; return result; } // Die Kommandozeile des Moduls if (multiboot_module->cmdline) { if (i-- == 0) { - result.start = (paddr_t) (uintptr_t) multiboot_module-> - cmdline; - result.end = (paddr_t) (uintptr_t) multiboot_module-> - cmdline + strlen((char*) (uintptr_t) multiboot_module-> - cmdline); + result.start = (paddr_t) multiboot_module->cmdline; + result.end = (paddr_t) multiboot_module->cmdline + + strlen((char*) (uintptr_t) multiboot_module->cmdline); return result; } } @@ -564,7 +561,7 @@ void pmm_init(struct multiboot_info* multiboot_info) { // Finde einen Platz für die Bitmap size_t bitmap_size = required_bitmap_size(multiboot_info); - pmm_bitmap = find_bitmap_mem(multiboot_info, bitmap_size); + pmm_bitmap = (void*) find_bitmap_mem(multiboot_info, bitmap_size); pmm_bitmap_length = 8 * bitmap_size / PMM_BITS_PER_ELEMENT; // Am Anfang ist alles besetzt diff --git a/src/kernel2/src/syscalls/pm.c b/src/kernel2/src/syscalls/pm.c index a3025cb..806e827 100644 --- a/src/kernel2/src/syscalls/pm.c +++ b/src/kernel2/src/syscalls/pm.c @@ -187,7 +187,7 @@ void syscall_init_child_page(pid_t pid, vaddr_t dest, vaddr_t src, size_t size) paddr_t dest_phys = mmc_resolve(&process->context, dest_cur); paddr_t src_phys = mmc_resolve(&mmc_current_context(), src_cur); - if (dest_phys != NULL) { + if (dest_phys != (paddr_t) NULL) { // Die Page temporaer mappen vaddr_t dest_vaddr = vmm_kernel_automap(dest_phys, PAGE_SIZE); memcpy(dest_vaddr, src_cur, PAGE_SIZE); diff --git a/src/kernel2/src/syscalls/rpc.c b/src/kernel2/src/syscalls/rpc.c index 2f1e1bc..382c882 100644 --- a/src/kernel2/src/syscalls/rpc.c +++ b/src/kernel2/src/syscalls/rpc.c @@ -85,7 +85,7 @@ static void adjust_stack_size(pm_thread_t* callee, } if(mmc_resolve(&callee->process->context, - (vaddr_t) callee_isf->esp - rounded_data_size) == NULL) + (vaddr_t) callee_isf->esp - rounded_data_size) == (paddr_t) NULL) { // TODO Das könnte bis zu (pages_count - 1) Pages zu viel reservieren increase_user_stack_size(callee, pages_count); diff --git a/src/kernel2/src/tasks/modules.c b/src/kernel2/src/tasks/modules.c index 080fd24..f5a839f 100644 --- a/src/kernel2/src/tasks/modules.c +++ b/src/kernel2/src/tasks/modules.c @@ -120,7 +120,7 @@ static void load_module(struct multiboot_module* multiboot_module) // Modul unmappen und Speicher freigeben vmm_kernel_unmap(image_start, image_size); - pmm_free((vaddr_t) multiboot_module_mapped->start, NUM_PAGES(image_size)); + pmm_free((paddr_t) multiboot_module_mapped->start, NUM_PAGES(image_size)); } /** @@ -143,17 +143,17 @@ void load_multiboot_modules(struct multiboot_info* multiboot_info) multiboot_module_phys = (void*) multiboot_info->mi_mods_addr; // Speicher für die Modulparameter - char* mod_cmdline_page = pmm_alloc(1); + paddr_t mod_cmdline_page_phys = pmm_alloc(1); void* mod_cmdline_task = mmc_automap( - &init_process->context, mod_cmdline_page, 1, + &init_process->context, mod_cmdline_page_phys, 1, MM_USER_START, MM_USER_END, MM_FLAGS_USER_DATA); - mod_cmdline_page = vmm_kernel_automap(mod_cmdline_page, PAGE_SIZE); + char* mod_cmdline_page = vmm_kernel_automap(mod_cmdline_page_phys, PAGE_SIZE); char* mod_cmdline = mod_cmdline_page; size_t mod_cmdline_free = PAGE_SIZE; // Speicher für die Modulliste - void* mod_list_phys = pmm_alloc(1); + paddr_t mod_list_phys = pmm_alloc(1); void* mod_list_task = mmc_automap( &init_process->context, mod_list_phys, 1, MM_USER_START, MM_USER_END, MM_FLAGS_USER_DATA); -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:28 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:28 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_06/11=5D_pointer=3A_nicht_von_f?= =?utf-8?q?esten_Gr=C3=B6=C3=9Fen_f=C3=BCr_Pointer_ausgehen?= In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-6-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --HG-- extra : rebase_source : 35224a9aa9efa98681cace02bdd1415f1ed485dc --- src/kernel2/src/interrupts/im.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/kernel2/src/interrupts/im.c b/src/kernel2/src/interrupts/im.c index 9923b7a..ce0d2c4 100644 --- a/src/kernel2/src/interrupts/im.c +++ b/src/kernel2/src/interrupts/im.c @@ -253,7 +253,7 @@ interrupt_stack_frame_t* im_prepare_current_thread(void) */ static void on_process_destroy(pm_process_t* process, void* prv) { - uint32_t intr = (uint32_t) prv; + uint32_t intr = (uintptr_t) prv; if (intr >= IM_NUM_INTERRUPTS) { panic("im.c: on_process_destroy(): Korrupte Interruptnummer %d", intr); -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:29 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:29 +0100 Subject: [tyndur-devel] [PATCH 07/11] vm86: ist arch/i386 spezifisch In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-7-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --HG-- extra : rebase_source : 286b5db929305a221f3a7f57f740286238c87f46 --- src/kernel2/src/init.c | 4 +++- src/kernel2/src/interrupts/im.c | 2 ++ src/kernel2/src/syscall.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/kernel2/src/init.c b/src/kernel2/src/init.c index fc9bebd..37c6397 100644 --- a/src/kernel2/src/init.c +++ b/src/kernel2/src/init.c @@ -101,9 +101,11 @@ void init(int multiboot_magic, struct multiboot_info *boot_info, bool bsp) } #endif +#if CONFIG_ARCH == ARCH_I386 // IVT fuer den VM86 sichern vm86_init(); - +#endif + debug_print(DEBUG_FLAG_INIT, "Initialisiere physikalische" "Speicherverwaltung"); pmm_init(&multiboot_info); diff --git a/src/kernel2/src/interrupts/im.c b/src/kernel2/src/interrupts/im.c index ce0d2c4..d266959 100644 --- a/src/kernel2/src/interrupts/im.c +++ b/src/kernel2/src/interrupts/im.c @@ -72,6 +72,7 @@ static void handle_exception(interrupt_stack_frame_t* isf, uint8_t int_num) // kprintf("user_stack_bottom = %x\n", // current_thread->user_stack_bottom); +#if CONFIG_ARCH == ARCH_I386 // Pruefen, ob ein VM86-Task die Exception ausgeloest hat // Falls ja lassen wir sie vom VM86-Code behandeln, wenn er kann if (isf->eflags & 0x20000) { @@ -79,6 +80,7 @@ static void handle_exception(interrupt_stack_frame_t* isf, uint8_t int_num) return; } } +#endif if (int_num == 0x0d) { // Pruefen, ob der #GP moeglicherweise durch eine nicht geladene diff --git a/src/kernel2/src/syscall.c b/src/kernel2/src/syscall.c index 5a4aad4..2069738 100644 --- a/src/kernel2/src/syscall.c +++ b/src/kernel2/src/syscall.c @@ -95,8 +95,10 @@ void syscall_init() syscall_register(SYSCALL_SHM_ATTACH, &syscall_shm_attach, 1); syscall_register(SYSCALL_SHM_DETACH, &syscall_shm_detach, 1); +#if CONFIG_ARCH == ARCH_I386 syscall_register(SYSCALL_VM86, &syscall_vm86_old, 2); syscall_register(SYSCALL_VM86_BIOS_INT, &syscall_vm86, 3); +#endif } /** -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:30 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:30 +0100 Subject: [tyndur-devel] [PATCH 08/11] lib/loader: kleine fixes im elf-loader In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-8-git-send-email-m.nemo@gmx.net> ! elf64 nur bauen wenn arch != i386 ! elf64 Varablennamen und typecast * elf32 nur bauen wenn arch != amd64 Signed-off-by: Andreas Freimuth --HG-- extra : rebase_source : 462d51ca7e73b775382403073decb28328262972 --- src/lib/bin_loader/elf32.c | 4 ++++ src/lib/bin_loader/elf64.c | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/bin_loader/elf32.c b/src/lib/bin_loader/elf32.c index 6091aae..ff49df8 100644 --- a/src/lib/bin_loader/elf32.c +++ b/src/lib/bin_loader/elf32.c @@ -70,6 +70,9 @@ bool loader_elf32_load_image(pid_t process, vaddr_t image_start, size_t image_size) { +#if CONFI_ARCH == AMD64 + return false; +#else Elf32_Ehdr* elf_header = (Elf32_Ehdr*) image_start; // Nur gueltige ELF-Images laden @@ -128,6 +131,7 @@ bool loader_elf32_load_image(pid_t process, vaddr_t image_start, num_pages * PAGE_SIZE); return true; +#endif } diff --git a/src/lib/bin_loader/elf64.c b/src/lib/bin_loader/elf64.c index 7bed47d..ef5de5e 100644 --- a/src/lib/bin_loader/elf64.c +++ b/src/lib/bin_loader/elf64.c @@ -33,6 +33,8 @@ #include #include #include + +#include #define ELF_MAGIC (ELFMAG0 | (ELFMAG1 << 8) | (ELFMAG2 << 16) | (ELFMAG3 << 24)) /** @@ -68,7 +70,7 @@ bool loader_is_elf64(vaddr_t image_start, size_t image_size) bool loader_elf64_load_image(pid_t process, vaddr_t image_start, size_t image_size) { -#if CONFIG_ARCH == ARCH_AMD64 +#if CONFIG_ARCH == ARCH_I386 return false; #else Elf64_Ehdr* elf_header = (Elf64_Ehdr*) image_start; @@ -77,7 +79,7 @@ bool loader_elf64_load_image(pid_t process, vaddr_t image_start, return false; } - loader_create_thread(process, elf_header->entry); + loader_create_thread(process, (vaddr_t) elf_header->e_entry); // FIXME: Das gibt bei i386 viele warnungen ;-) @@ -105,7 +107,7 @@ bool loader_elf64_load_image(pid_t process, vaddr_t image_start, // Den geladenen Speicher in den Adressraum des Prozesses // verschieben - loader_assign_mem(process, program_header->p_vaddr, mem_image, + loader_assign_mem(process, (vaddr_t) program_header->p_vaddr, mem_image, page_count * PAGE_SIZE); } } -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:31 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:31 +0100 Subject: [tyndur-devel] [PATCH 09/11] arch: Unterscheidung zwischen amd64 und i386 eingeschmolzen In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-9-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --HG-- extra : rebase_source : ae72fc50e657602bae71020e22551bf8f2e82984 --- src/kernel2/src/init.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/kernel2/src/init.c b/src/kernel2/src/init.c index 37c6397..99ec00b 100644 --- a/src/kernel2/src/init.c +++ b/src/kernel2/src/init.c @@ -156,18 +156,17 @@ void init(int multiboot_magic, struct multiboot_info *boot_info, bool bsp) // TODO: Was tun, wenn dieses identity-Mapping schief geht? // Dies ist naehmlich sher warscheinlich. + uintptr_t sp; #if CONFIG_ARCH == ARCH_AMD64 - uint64_t rsp; - asm volatile("movq %%rsp, %0" : "=r"(rsp)); - mmc_map(init_context, (vaddr_t) PAGE_ALIGN_ROUND_DOWN(rsp), - (paddr_t) PAGE_ALIGN_ROUND_DOWN(rsp), MM_FLAGS_KERNEL_DATA, 1); - im_enable(); + asm volatile("movq %%rsp, %0" : "=r"(sp)); #else - uint32_t esp; - asm volatile("movl %%esp, %0" : "=r"(esp)); - mmc_map(init_context, (vaddr_t) PAGE_ALIGN_ROUND_DOWN(esp), - (paddr_t) PAGE_ALIGN_ROUND_DOWN(esp), MM_FLAGS_KERNEL_DATA, 1); + asm volatile("movl %%esp, %0" : "=r"(sp)); #endif + mmc_map(init_context, (vaddr_t) PAGE_ALIGN_ROUND_DOWN(sp), + (paddr_t) PAGE_ALIGN_ROUND_DOWN(sp), MM_FLAGS_KERNEL_DATA, 1); + + // amd64 only? + //im_enable(); } -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:32 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:32 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_10/11=5D_cpu=3A_Variablennamen_?= =?utf-8?q?die_Register_wiederspiegeln_umbenannt?= In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-10-git-send-email-m.nemo@gmx.net> * Beispiel: rax und eax in ax umbenannt Signed-off-by: Andreas Freimuth --HG-- extra : rebase_source : 59882b153d42cfac24a0dd15b25fe28d70af0ced --- src/kernel2/include/arch/amd64/cpu.h | 20 ++++++------ src/kernel2/include/arch/i386/cpu.h | 22 +++++++------- src/kernel2/src/arch/amd64/cpu.c | 40 ++++++++++++------------ src/kernel2/src/arch/i386/cpu.c | 22 +++++++------- src/kernel2/src/arch/i386/debug.c | 2 +- src/kernel2/src/arch/i386/syscall.c | 22 +++++++------- src/kernel2/src/arch/i386/vm86.c | 56 +++++++++++++++++----------------- src/kernel2/src/interrupts/im.c | 16 +++++----- src/kernel2/src/syscalls/rpc.c | 44 +++++++++++++------------- src/kernel2/src/tasks/modules.c | 2 +- src/kernel2/src/tasks/thread.c | 17 ++++------ 11 files changed, 130 insertions(+), 133 deletions(-) diff --git a/src/kernel2/include/arch/amd64/cpu.h b/src/kernel2/include/arch/amd64/cpu.h index bd60f26..67fb194 100644 --- a/src/kernel2/include/arch/amd64/cpu.h +++ b/src/kernel2/include/arch/amd64/cpu.h @@ -48,25 +48,25 @@ typedef struct { } cpu_t; typedef struct { - uint64_t rbx; - uint64_t rcx; - uint64_t rdx; - uint64_t rsi; - uint64_t rdi; - uint64_t rbp; + uint64_t bx; + uint64_t cx; + uint64_t dx; + uint64_t si; + uint64_t di; + uint64_t bp; uint64_t r[8]; uint64_t ds; uint64_t es; - uint64_t rax; + uint64_t ax; uint64_t interrupt_number; uint64_t error_code; - uint64_t rip; + uint64_t ip; uint64_t cs; - uint64_t rflags; - uint64_t rsp; + uint64_t flags; + uint64_t sp; uint64_t ss; uint64_t fs, gs; diff --git a/src/kernel2/include/arch/i386/cpu.h b/src/kernel2/include/arch/i386/cpu.h index 9b9acbd..666a7a7 100644 --- a/src/kernel2/include/arch/i386/cpu.h +++ b/src/kernel2/include/arch/i386/cpu.h @@ -44,26 +44,26 @@ typedef uint8_t cpu_id_t; typedef struct { - uint32_t ebx; - uint32_t ecx; - uint32_t edx; - uint32_t esi; - uint32_t edi; - uint32_t ebp; - + uint32_t bx; + uint32_t cx; + uint32_t dx; + uint32_t si; + uint32_t di; + uint32_t bp; + uint32_t ds; uint32_t es; uint32_t fs; uint32_t gs; - uint32_t eax; + uint32_t ax; uint32_t interrupt_number; uint32_t error_code; - uint32_t eip; + uint32_t ip; uint32_t cs; - uint32_t eflags; - uint32_t esp; + uint32_t flags; + uint32_t sp; uint32_t ss; } __attribute__((packed)) interrupt_stack_frame_t; diff --git a/src/kernel2/src/arch/amd64/cpu.c b/src/kernel2/src/arch/amd64/cpu.c index b9f2b7d..6634c36 100644 --- a/src/kernel2/src/arch/amd64/cpu.c +++ b/src/kernel2/src/arch/amd64/cpu.c @@ -124,24 +124,24 @@ uint64_t cpu_read_msr(uint32_t msr) void cpu_dump(machine_state_t* machine_state) { kprintf("RAX=0x%08x%08x RBX=0x%08x%08x RCX=0x%08x%08x\n", - (uint32_t) (machine_state->rax >> 32), - (uint32_t) (machine_state->rax & 0xFFFFFFFF), - (uint32_t) (machine_state->rbx >> 32), - (uint32_t) (machine_state->rbx & 0xFFFFFFFF), - (uint32_t) (machine_state->rcx >> 32), - (uint32_t) (machine_state->rcx & 0xFFFFFFFF)); + (uint32_t) (machine_state->ax >> 32), + (uint32_t) (machine_state->ax & 0xFFFFFFFF), + (uint32_t) (machine_state->bx >> 32), + (uint32_t) (machine_state->bx & 0xFFFFFFFF), + (uint32_t) (machine_state->cx >> 32), + (uint32_t) (machine_state->cx & 0xFFFFFFFF)); kprintf("RDX=0x%08x%08x RSI=0x%08x%08x RDI=0x%08x%08x\n", - (uint32_t) (machine_state->rdx >> 32), - (uint32_t) (machine_state->rdx & 0xFFFFFFFF), - (uint32_t) (machine_state->rsi >> 32), - (uint32_t) (machine_state->rsi & 0xFFFFFFFF), - (uint32_t) (machine_state->rdi >> 32), - (uint32_t) (machine_state->rdi & 0xFFFFFFFF)); + (uint32_t) (machine_state->dx >> 32), + (uint32_t) (machine_state->dx & 0xFFFFFFFF), + (uint32_t) (machine_state->si >> 32), + (uint32_t) (machine_state->si & 0xFFFFFFFF), + (uint32_t) (machine_state->di >> 32), + (uint32_t) (machine_state->di & 0xFFFFFFFF)); kprintf("RSP=0x%08x%08x RBP=0x%08x%08x R08=0x%08x%08x\n", - (uint32_t) (machine_state->rsp >> 32), - (uint32_t) (machine_state->rsp & 0xFFFFFFFF), - (uint32_t) (machine_state->rbp >> 32), - (uint32_t) (machine_state->rbp & 0xFFFFFFFF), + (uint32_t) (machine_state->sp >> 32), + (uint32_t) (machine_state->sp & 0xFFFFFFFF), + (uint32_t) (machine_state->bp >> 32), + (uint32_t) (machine_state->bp & 0xFFFFFFFF), (uint32_t) (machine_state->r[0] >> 32), (uint32_t) (machine_state->r[0] & 0xFFFFFFFF)); kprintf("R09=0x%08x%08x R10=0x%08x%08x R11=0x%08x%08x\n", @@ -161,10 +161,10 @@ void cpu_dump(machine_state_t* machine_state) kprintf("R15=0x%08x%08x RIP=0x%08x%08x RFL=0x%08x%08x\n", (uint32_t) (machine_state->r[7] >> 32), (uint32_t) (machine_state->r[7] & 0xFFFFFFFF), - (uint32_t) (machine_state->rip >> 32), - (uint32_t) (machine_state->rip & 0xFFFFFFFF), - (uint32_t) (machine_state->rflags >> 32), - (uint32_t) (machine_state->rflags & 0xFFFFFFFF)); + (uint32_t) (machine_state->ip >> 32), + (uint32_t) (machine_state->ip & 0xFFFFFFFF), + (uint32_t) (machine_state->flags >> 32), + (uint32_t) (machine_state->flags & 0xFFFFFFFF)); kprintf("CS=0x%04x DS=0x%04x ES=0x%04x FS=0x%04x GS=0x%04x " "SS=0x%04x\n", diff --git a/src/kernel2/src/arch/i386/cpu.c b/src/kernel2/src/arch/i386/cpu.c index 102c585..e3701e9 100644 --- a/src/kernel2/src/arch/i386/cpu.c +++ b/src/kernel2/src/arch/i386/cpu.c @@ -132,19 +132,19 @@ uint64_t cpu_read_msr(uint32_t msr) void cpu_dump(machine_state_t* machine_state) { // TODO: ID der CPU - kprintf("EAX=0x%016x EBX=0x%016x ECX=0x%016x\n", machine_state->eax, - machine_state->ebx, machine_state->ecx); - kprintf("EDX=0x%016x ESI=0x%016x EDI=0x%016x\n", machine_state->edx, - machine_state->esi, machine_state->esi); - kprintf("ESP=0x%016x EBP=0x%016x RIP=0x%016x\n", machine_state->esp, - machine_state->ebp, machine_state->eip); + kprintf("EAX=0x%016x EBX=0x%016x ECX=0x%016x\n", machine_state->ax, + machine_state->bx, machine_state->cx); + kprintf("EDX=0x%016x ESI=0x%016x EDI=0x%016x\n", machine_state->dx, + machine_state->si, machine_state->si); + kprintf("ESP=0x%016x EBP=0x%016x RIP=0x%016x\n", machine_state->sp, + machine_state->bp, machine_state->ip); uint32_t cr2, cr3; asm volatile("movl %%cr2, %0;" "movl %%cr3, %1;" : "=r"(cr2), "=r"(cr3)); - kprintf("EFL=0x%016x CR2=0x%016x CR3=0x%016x\n", machine_state->eflags, + kprintf("EFL=0x%016x CR2=0x%016x CR3=0x%016x\n", machine_state->flags, cr2, cr3); kprintf("CS=0x%04x DS=0x%04x ES=0x%04x FS=0x%04x GS=0x%04x " @@ -162,7 +162,7 @@ void cpu_prepare_current_task(void) interrupt_stack_frame_t* user_isf = thread->user_isf; cpu_get_current()->tss.ss0 = 2 << 3; - if (user_isf->eflags & 0x20000) { + if (user_isf->flags & 0x20000) { cpu_get_current()->tss.esp0 = (uintptr_t) user_isf + sizeof(struct vm86_isf); } else { @@ -186,9 +186,9 @@ int arch_init_ppb(pm_process_t* process, int shm_id, void* ptr, size_t size) pm_thread_t* thread = list_get_element_at(process->threads, 0); interrupt_stack_frame_t* user_isf = thread->user_isf; - user_isf->eax = shm_id; - user_isf->ebx = (uintptr_t) ptr; - user_isf->ecx = size; + user_isf->ax = shm_id; + user_isf->bx = (uintptr_t) ptr; + user_isf->cx = size; return 0; } diff --git a/src/kernel2/src/arch/i386/debug.c b/src/kernel2/src/arch/i386/debug.c index 6d4ef54..173ad4f 100644 --- a/src/kernel2/src/arch/i386/debug.c +++ b/src/kernel2/src/arch/i386/debug.c @@ -208,7 +208,7 @@ void print_tasks_backtrace(void) for (j = 0; (thread = list_get_element_at(process->threads, j)); j++) { kprintf("Thread %d: Status %d\n", j, thread->status); isf = (machine_state_t*) thread->kernel_stack; - stack_backtrace(isf->ebp, isf->eip); + stack_backtrace(isf->bp, isf->ip); } } diff --git a/src/kernel2/src/arch/i386/syscall.c b/src/kernel2/src/arch/i386/syscall.c index 7f4a45e..ae83e56 100644 --- a/src/kernel2/src/arch/i386/syscall.c +++ b/src/kernel2/src/arch/i386/syscall.c @@ -62,8 +62,8 @@ void syscall_arch(machine_state_t* isf) // "Kompatibel" zu kernel1 void syscall_arch(machine_state_t* isf) { - uint32_t* stack = (uint32_t*) isf->esp; - uint32_t number = isf->eax; + uint32_t* stack = (uint32_t*) isf->sp; + uint32_t number = isf->ax; //kprintf("Syscall %d", number); if ((number >= SYSCALL_MAX) || (syscalls[number].handler == NULL)) { @@ -76,13 +76,13 @@ void syscall_arch(machine_state_t* isf) // FIXME Das ist alles nur bedingt ueberzeugend... if (handler == syscall_fastrpc) { - pid_t callee_pid = *((uint32_t*) isf->esp); - uint32_t metadata_size = *((uint32_t*) (isf->esp + 4)); - void* metadata = *((void**) (isf->esp + 8)); - uint32_t data_size = *((uint32_t*) (isf->esp + 12)); - void* data = *((void**) (isf->esp + 16)); + pid_t callee_pid = *((uint32_t*) isf->sp); + uint32_t metadata_size = *((uint32_t*) (isf->sp + 4)); + void* metadata = *((void**) (isf->sp + 8)); + uint32_t data_size = *((uint32_t*) (isf->sp + 12)); + void* data = *((void**) (isf->sp + 16)); - isf->eax = syscall_fastrpc( + isf->ax = syscall_fastrpc( callee_pid, metadata_size, metadata, data_size, data); @@ -93,7 +93,7 @@ void syscall_arch(machine_state_t* isf) } else if (handler == syscall_mem_info) { - syscall_mem_info(&isf->eax, &isf->edx); + syscall_mem_info(&isf->ax, &isf->dx); } else { uint32_t eax, edx; @@ -110,9 +110,9 @@ void syscall_arch(machine_state_t* isf) : "S" (stack), "r" (handler), "c" (syscalls[number].arg_count * 4) : "edi", "ebx", "memory"); - isf->eax = eax; + isf->ax = eax; if (handler == syscall_get_tick_count) { - isf->edx = edx; + isf->dx = edx; } } } diff --git a/src/kernel2/src/arch/i386/vm86.c b/src/kernel2/src/arch/i386/vm86.c index 3594378..7752585 100644 --- a/src/kernel2/src/arch/i386/vm86.c +++ b/src/kernel2/src/arch/i386/vm86.c @@ -128,18 +128,18 @@ static int create_vm86_task(int intr, vm86_regs_t* regs, uintptr_t stack) // Register setzen - isf->eflags = 0x20202; + isf->flags = 0x20202; isf->cs = ivt_entry[1]; isf->ss = stack / 16; - isf->eax = regs->ax; - isf->ebx = regs->bx; - isf->ecx = regs->cx; - isf->edx = regs->dx; - isf->esi = regs->si; - isf->edi = regs->di; - isf->esp = PAGE_SIZE - 16; - isf->ebp = 0; + isf->ax = regs->ax; + isf->bx = regs->bx; + isf->cx = regs->cx; + isf->dx = regs->dx; + isf->si = regs->si; + isf->di = regs->di; + isf->sp = PAGE_SIZE - 16; + isf->bp = 0; // Segmentregister setzen // Dabei wird der bisherige Kernelstack in die temporaere @@ -310,12 +310,12 @@ static void destroy_vm86_task(interrupt_stack_frame_t* isf) // Register sichern vm86_regs_t* regs = vm86_status.regs; - regs->ax = isf->eax; - regs->bx = isf->ebx; - regs->cx = isf->ecx; - regs->dx = isf->edx; - regs->si = isf->esi; - regs->di = isf->edi; + regs->ax = isf->ax; + regs->bx = isf->bx; + regs->cx = isf->cx; + regs->dx = isf->dx; + regs->si = isf->si; + regs->di = isf->di; regs->ds = visf->ds; regs->es = visf->es; @@ -327,15 +327,15 @@ static void destroy_vm86_task(interrupt_stack_frame_t* isf) /** Pusht einen Wert auf den Stack des VM86-Tasks */ static inline void emulator_push(interrupt_stack_frame_t* isf, uint16_t value) { - isf->esp -= 2; - ((uint16_t*)(isf->esp + (isf->ss << 4)))[0] = value; + isf->sp -= 2; + ((uint16_t*)(isf->sp + (isf->ss << 4)))[0] = value; } /** Popt einen Wert vom Stack des VM86-Tasks */ static inline uint16_t emulator_pop(interrupt_stack_frame_t* isf) { - uint16_t res = ((uint16_t*)(isf->esp + (isf->ss << 4)))[0]; - isf->esp += 2; + uint16_t res = ((uint16_t*)(isf->sp + (isf->ss << 4)))[0]; + isf->sp += 2; return res; } @@ -357,19 +357,19 @@ int vm86_exception(interrupt_stack_frame_t* isf) } // Ein toller Emulator fuer privilegierte Instruktionen - uint8_t* ops = (uint8_t*)(isf->eip + (isf->cs << 4)); + uint8_t* ops = (uint8_t*)(isf->ip + (isf->cs << 4)); switch (ops[0]) { case 0x9c: /* pushf */ - emulator_push(isf, isf->eflags); - isf->eip++; + emulator_push(isf, isf->flags); + isf->ip++; break; case 0x9d: /* popf */ // So tun, als würden wir die EFLAGS wiederherstellen. // Das hier ist wohl alles andere als korrekt, aber funzt erstmal. emulator_pop(isf); - isf->eip++; + isf->ip++; break; case 0xcd: /* int */ @@ -377,11 +377,11 @@ int vm86_exception(interrupt_stack_frame_t* isf) uint16_t intr = ops[1] & 0xff; uint16_t* ivt_entry = bios_data.ivt[intr]; - emulator_push(isf, isf->eip + 2); + emulator_push(isf, isf->ip + 2); emulator_push(isf, isf->cs); - emulator_push(isf, isf->eflags); + emulator_push(isf, isf->flags); - isf->eip = ivt_entry[0]; + isf->ip = ivt_entry[0]; isf->cs = ivt_entry[1]; break; } @@ -389,7 +389,7 @@ int vm86_exception(interrupt_stack_frame_t* isf) case 0xcf: /* iret */ // Wenn es das finale iret ist, koennen wir den VM86-Task beenden - if (isf->esp == PAGE_SIZE - 16) { + if (isf->sp == PAGE_SIZE - 16) { destroy_vm86_task(isf); return 1; } @@ -397,7 +397,7 @@ int vm86_exception(interrupt_stack_frame_t* isf) // Ansonsten muss es ganz normal emuliert werden emulator_pop(isf); isf->cs = emulator_pop(isf); - isf->eip = emulator_pop(isf); + isf->ip = emulator_pop(isf); break; default: diff --git a/src/kernel2/src/interrupts/im.c b/src/kernel2/src/interrupts/im.c index d266959..7ab6a89 100644 --- a/src/kernel2/src/interrupts/im.c +++ b/src/kernel2/src/interrupts/im.c @@ -75,7 +75,7 @@ static void handle_exception(interrupt_stack_frame_t* isf, uint8_t int_num) #if CONFIG_ARCH == ARCH_I386 // Pruefen, ob ein VM86-Task die Exception ausgeloest hat // Falls ja lassen wir sie vom VM86-Code behandeln, wenn er kann - if (isf->eflags & 0x20000) { + if (isf->flags & 0x20000) { if (vm86_exception(isf)) { return; } @@ -96,7 +96,7 @@ static void handle_exception(interrupt_stack_frame_t* isf, uint8_t int_num) if (int_num == 0x0e) { // Ueberprüfen ob der Pagefault durch einen Stackoverflow // hervorgerufen wurde. Falls ja: Stack vergroessern und weitermachen - if ((cr2 <= isf->esp + 0x800) && (cr2 >= isf->esp - 0x20) + if ((cr2 <= isf->sp + 0x800) && (cr2 >= isf->sp - 0x20) && (current_thread != NULL) && ((void*) cr2 >= current_thread->user_stack_bottom - 0x1000000) && ((void*) cr2 < current_thread->user_stack_bottom)) @@ -118,11 +118,11 @@ static void handle_exception(interrupt_stack_frame_t* isf, uint8_t int_num) // Ein Stacktrace duerfen wir nur ausgeben, wenn kein Pagefault wegen // dem Stack aufgetreten ist! - if (!((cr2 < isf->esp + 800) && (cr2 >= isf->esp -0x20))) { + if (!((cr2 < isf->sp + 800) && (cr2 >= isf->sp -0x20))) { // Und fuer VM86 muessten wir wenigstens noch das Segment // beruecksichtigen, aber eigentlich brauchen wir ihn da gar nicht - if ((isf->eflags & 0x20000) == 0) { - stack_backtrace(isf->ebp, isf->eip); + if ((isf->flags & 0x20000) == 0) { + stack_backtrace(isf->bp, isf->ip); } } @@ -156,7 +156,7 @@ interrupt_stack_frame_t* im_handler(interrupt_stack_frame_t* isf) interrupt_stack_frame_t* new_isf = isf; uintptr_t isf_addr = (uintptr_t) isf; #ifndef CONFIG_RELEASE_VERSION - uint32_t eax = isf->eax; + uint32_t ax = isf->ax; #endif if ((isf_addr < (uintptr_t) thread->kernel_stack_bottom) || @@ -168,7 +168,7 @@ interrupt_stack_frame_t* im_handler(interrupt_stack_frame_t* isf) } // Wenn der Int aus dem Userspace kommt, legen wir den zugehoerigen ISF ab - if ((isf->cs & 0x3) || (isf->eflags & 0x20000)) { + if ((isf->cs & 0x3) || (isf->flags & 0x20000)) { thread->user_isf = isf; } @@ -221,7 +221,7 @@ interrupt_stack_frame_t* im_handler(interrupt_stack_frame_t* isf) if (thread->status != PM_STATUS_RUNNING) { panic("Aktiver Task hat nicht PM_STATUS_RUNNING: " "PID %d, int %x, eax = %d\n", - thread->process->pid, int_num, eax); + thread->process->pid, int_num, ax); } #endif diff --git a/src/kernel2/src/syscalls/rpc.c b/src/kernel2/src/syscalls/rpc.c index 382c882..0d36e72 100644 --- a/src/kernel2/src/syscalls/rpc.c +++ b/src/kernel2/src/syscalls/rpc.c @@ -48,12 +48,12 @@ #include "im.h" typedef struct { - uintptr_t old_eip; - uintptr_t old_esp; + uintptr_t old_ip; + uintptr_t old_sp; // FIXME Das tut nur fuer i386... - uint32_t eflags; - uint32_t eax; + uint32_t flags; + uint32_t ax; uint8_t reenable_irq; @@ -80,12 +80,12 @@ static void adjust_stack_size(pm_thread_t* callee, { // Falls der Stack nicht ausreicht, vergrößern size_t pages_count = ((rounded_data_size + PAGE_SIZE - 1) / PAGE_SIZE); - if ((rounded_data_size % PAGE_SIZE) > (callee_isf->esp % PAGE_SIZE)) { + if ((rounded_data_size % PAGE_SIZE) > (callee_isf->sp % PAGE_SIZE)) { pages_count++; } if(mmc_resolve(&callee->process->context, - (vaddr_t) callee_isf->esp - rounded_data_size) == (paddr_t) NULL) + (vaddr_t) callee_isf->sp - rounded_data_size) == (paddr_t) NULL) { // TODO Das könnte bis zu (pages_count - 1) Pages zu viel reservieren increase_user_stack_size(callee, pages_count); @@ -208,11 +208,11 @@ int do_fastrpc(pid_t callee_pid, size_t metadata_size, void* metadata, interrupt_stack_frame_t* callee_isf = callee->user_isf; rpc_t* rpc = malloc(sizeof(rpc_t)); - rpc->old_eip = callee_isf->eip; - rpc->old_esp = callee_isf->esp; - rpc->eax = callee_isf->eax; - rpc->eflags = callee_isf->eflags; - rpc->caller = current_thread; + rpc->old_ip = callee_isf->ip; + rpc->old_sp = callee_isf->sp; + rpc->ax = callee_isf->ax; + rpc->flags = callee_isf->flags; + rpc->caller = current_thread; if ((callee == current_thread) && syscall) { // Bei einem Self-RPC, der ein Syscall war (kein kernelinterner Aufruf @@ -220,7 +220,7 @@ int do_fastrpc(pid_t callee_pid, size_t metadata_size, void* metadata, // des RPC-Syscalls in eax stehen. Ein IRQ erscheint auch // als Self-RPC, darf aber eax nicht kaputt machen, da dort kein // Rueckgabewert erwartet wird, sondern der vorherige Wert. - rpc->eax = 0; + rpc->ax = 0; } rpc->reenable_irq = 0; @@ -237,16 +237,16 @@ int do_fastrpc(pid_t callee_pid, size_t metadata_size, void* metadata, // Dazu wird der Stack des aufgerufenen Tasks temporaer gemappt adjust_stack_size(callee, callee_isf, rounded_data_size); - callee_isf->esp -= rounded_data_size; + callee_isf->sp -= rounded_data_size; void* first_stack_page = mmc_automap_user( &mmc_current_context(), &callee->process->context, - (vaddr_t) PAGE_ALIGN_ROUND_DOWN(callee_isf->esp), - NUM_PAGES(rounded_data_size + ((uintptr_t) callee_isf->esp % PAGE_SIZE)), + (vaddr_t) PAGE_ALIGN_ROUND_DOWN(callee_isf->sp), + NUM_PAGES(rounded_data_size + ((uintptr_t) callee_isf->sp % PAGE_SIZE)), KERNEL_MEM_START, KERNEL_MEM_END, MM_FLAGS_KERNEL_DATA); - void* stack = first_stack_page + ((uintptr_t) callee_isf->esp % PAGE_SIZE); + void* stack = first_stack_page + ((uintptr_t) callee_isf->sp % PAGE_SIZE); ((uint32_t*) stack)[0] = data_size + metadata_size; ((uint32_t*) stack)[1] = current_process->pid; @@ -266,7 +266,7 @@ int do_fastrpc(pid_t callee_pid, size_t metadata_size, void* metadata, // Zum RPC-Handler springen - callee_isf->eip = (uintptr_t) callee->process->rpc_handler; + callee_isf->ip = (uintptr_t) callee->process->rpc_handler; // Temporaere Mappings wieder aufheben mmc_unmap(&mmc_current_context(), first_stack_page, @@ -355,7 +355,7 @@ void syscall_fastrpc_ret(void) if (rpc == NULL) { #if 0 if(debug_test_flag(DEBUG_FLAG_STACK_BACKTRACE)) { - stack_backtrace_ebp(callee_isf->ebp, callee_isf->eip); + stack_backtrace_ebp(callee_isf->ebp, callee_isf->ip); } #endif panic("Unerwartete Rueckkehr vom RPC-Handler\n"); @@ -364,10 +364,10 @@ void syscall_fastrpc_ret(void) } // Wiederherstellen der Register - callee_isf->eip = rpc->old_eip; - callee_isf->esp = rpc->old_esp; - callee_isf->eax = rpc->eax; - callee_isf->eflags = rpc->eflags; + callee_isf->ip = rpc->old_ip; + callee_isf->sp = rpc->old_sp; + callee_isf->ax = rpc->ax; + callee_isf->flags = rpc->flags; // kprintf("[%d => %d] RPC fertig.\n", // rpc->caller->process->pid, diff --git a/src/kernel2/src/tasks/modules.c b/src/kernel2/src/tasks/modules.c index f5a839f..84f3783 100644 --- a/src/kernel2/src/tasks/modules.c +++ b/src/kernel2/src/tasks/modules.c @@ -177,7 +177,7 @@ void load_multiboot_modules(struct multiboot_info* multiboot_info) interrupt_stack_frame_t* init_isf = (interrupt_stack_frame_t*) init_thread->kernel_stack; - init_isf->esp -= 8; + init_isf->sp -= 8; // Das unterste dword auf der Page mit der Liste beinhaltet die // Anzahl der Module diff --git a/src/kernel2/src/tasks/thread.c b/src/kernel2/src/tasks/thread.c index 618d369..7521cb6 100644 --- a/src/kernel2/src/tasks/thread.c +++ b/src/kernel2/src/tasks/thread.c @@ -85,31 +85,28 @@ pm_thread_t* pm_thread_create(pm_process_t* process, vaddr_t entry) memset(isf, 0, sizeof(interrupt_stack_frame_t)); #if CONFIG_ARCH == ARCH_I386 - isf->esp = (uint32_t) process->next_stack; - isf->eip = (uint32_t) entry; - // Flags: Interrupts aktivieren, und PL fuer IO-Operationen auf 3 // setzen. - isf->eflags = 0x0202; - + isf->flags = 0x0202; + isf->cs = 0x1B; isf->ds = 0x23; isf->es = 0x23; isf->fs = 0x23; isf->gs = 0x23; isf->ss = 0x23; - #else - isf->rsp = (uint64_t) process->next_stack; - isf->rip = (uint64_t) entry; #endif - + + isf->sp = (uintptr_t) process->next_stack; + isf->ip = (uintptr_t) entry; + process->next_stack = (vaddr_t) ((uintptr_t) process->next_stack - USER_STACK_SIZE); // Page fuer den Userspace-Stack allozieren paddr_t stack_phys = pmm_alloc(NUM_PAGES(USER_STACK_SIZE)); - thread->user_stack_bottom = (vaddr_t) (isf->esp - USER_STACK_SIZE); + thread->user_stack_bottom = (vaddr_t) (isf->sp - USER_STACK_SIZE); mmc_map(&process->context, thread->user_stack_bottom, stack_phys, MM_FLAGS_USER_DATA, NUM_PAGES(USER_STACK_SIZE)); -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 9 20:33:33 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 9 Jan 2011 20:33:33 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_11/11=5D_kernel2=3A_TSS-Struktu?= =?utf-8?q?r_f=C3=BCr_arch/amd64?= In-Reply-To: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> Message-ID: <1294601613-19183-11-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --HG-- extra : rebase_source : 38132ff76acfe94f67c9df56b85c375e7a995d66 --- src/kernel2/include/arch/amd64/cpu.h | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/kernel2/include/arch/amd64/cpu.h b/src/kernel2/include/arch/amd64/cpu.h index 67fb194..1ffe971 100644 --- a/src/kernel2/include/arch/amd64/cpu.h +++ b/src/kernel2/include/arch/amd64/cpu.h @@ -42,12 +42,6 @@ typedef uint8_t cpu_id_t; typedef struct { - cpu_id_t id; - uint8_t apic_id; - bool bootstrap; -} cpu_t; - -typedef struct { uint64_t bx; uint64_t cx; uint64_t dx; @@ -74,6 +68,28 @@ typedef struct { typedef interrupt_stack_frame_t machine_state_t; +/// Task state segment +typedef struct { + uint32_t : 32; + uint64_t sp0, sp1, sp2; + uint64_t : 64; + uint64_t ist[7]; + uint64_t : 64; + uint16_t : 16; + uint16_t io_bit_map_offset; +} __attribute__((packed)) cpu_tss_t; + +// Dieser Wert muss ausserhalb des in der GDT definierten Limits +// fuer das TSS liegen +#define TSS_IO_BITMAP_NOT_LOADED UINT16_MAX + +typedef struct { + cpu_id_t id; + uint8_t apic_id; + bool bootstrap; + cpu_tss_t tss; +} cpu_t; + extern cpu_t cpus[]; extern size_t cpu_count; extern cpu_id_t cpu_id_bootstrap; -- 1.7.3.4 From kevin at tyndur.org Sun Jan 9 20:41:06 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sun, 9 Jan 2011 20:41:06 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH=5D_Build=3A_Auch_f=C3=BCr_CD-RO?= =?utf-8?q?Ms_kernel2_benutzen?= Message-ID: <1294602066-6755-1-git-send-email-kevin@tyndur.org> ! Build: Auch CD-ROM-Images müssen kernel2 benutzen nachdem sich die ABI ein bisschen verändert hat und kernel1 nicht mehr bootet. Signed-off-by: Kevin Wolf --- build/config/grub2_cdrom.cfg | 2 +- build/config/grub_cdrom.cfg | 4 ++-- build/scripts/image_cdrom_grub1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/config/grub2_cdrom.cfg b/build/config/grub2_cdrom.cfg index af35160..24073a7 100644 --- a/build/config/grub2_cdrom.cfg +++ b/build/config/grub2_cdrom.cfg @@ -6,7 +6,7 @@ default = 0 #deutsche Version menuentry "Tyndur (Deutsch)" { - multiboot /boot/tyndur /boot/tyndur debug=s + multiboot /boot/tyndur2 /boot/tyndur debug=s module /modules/init /modules/init boot=file:/ module /modules/ata /modules/ata module /modules/iso9660 /modules/iso9660 diff --git a/build/config/grub_cdrom.cfg b/build/config/grub_cdrom.cfg index 263f9f4..917d0d3 100644 --- a/build/config/grub_cdrom.cfg +++ b/build/config/grub_cdrom.cfg @@ -1,5 +1,5 @@ title tyndur (Deutsch) -kernel /tyndur debug=s +kernel /tyndur2 debug=s module /init boot=file:/ module /pci module /ata @@ -11,7 +11,7 @@ module /servmgr ata:/cdrom|iso9660:/hd.img|ramoverlay:/cached|ext2:/ vterm:/vter boot title tyndur (English) -kernel /tyndur debug=s +kernel /tyndur2 debug=s module /init boot=file:/ env.LANG=en module /pci module /ata diff --git a/build/scripts/image_cdrom_grub1 b/build/scripts/image_cdrom_grub1 index e7233f2..d8da018 100755 --- a/build/scripts/image_cdrom_grub1 +++ b/build/scripts/image_cdrom_grub1 @@ -119,7 +119,7 @@ fi mcopy -D o build/config/grub_cdrom.cfg l:/boot/grub/menu.lst # Die noetigsten Treiber auf das Floppy-Image packen -mcopy -D o $ROOT/boot/tyndur $ROOT/modules/init $ROOT/modules/console l:/ +mcopy -D o $ROOT/boot/tyndur2 $ROOT/modules/init $ROOT/modules/console l:/ mcopy -D o $ROOT/modules/ata $ROOT/modules/iso9660 $ROOT/modules/servmgr l:/ mcopy -D o $ROOT/modules/ext2 $ROOT/modules/ramoverlay $ROOT/modules/pci l:/ -- 1.6.0.2 From bluecoder at gmx.de Sun Jan 9 21:02:54 2011 From: bluecoder at gmx.de (=?iso-8859-1?q?J=F6rg_Pf=E4hler?=) Date: Sun, 9 Jan 2011 21:02:54 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH=5D_Build=3A_Auch_f=FCr_CD-?= =?iso-8859-1?q?ROMs_kernel2_benutzen?= In-Reply-To: <1294602066-6755-1-git-send-email-kevin@tyndur.org> References: <1294602066-6755-1-git-send-email-kevin@tyndur.org> Message-ID: <201101092102.55177.bluecoder@gmx.de> Am Sonntag, 9. Januar 2011, um 20:41:06 schrieb Kevin Wolf: > ! Build: Auch CD-ROM-Images müssen kernel2 benutzen nachdem sich die ABI > ein bisschen verändert hat und kernel1 nicht mehr bootet. > > Signed-off-by: Kevin Wolf Acked-by: Jörg Pfähler From hartmut at tyndur.org Mon Jan 10 18:52:20 2011 From: hartmut at tyndur.org (Alexander Hartmut Kluth) Date: Mon, 10 Jan 2011 09:52:20 -0800 Subject: [tyndur-devel] [PATCH] servmgr: Unglaublichen Schreibfehler gefixt Message-ID: <1294681940-5074-1-git-send-email-hartmut@tyndur.org> ! servmgr: Nun heisst es servmgr anstatt sermgr Signed-off-by: Alexander Hartmut Kluth --- src/modules/servmgr/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/modules/servmgr/main.c b/src/modules/servmgr/main.c index 019dc70..a432208 100644 --- a/src/modules/servmgr/main.c +++ b/src/modules/servmgr/main.c @@ -80,7 +80,7 @@ static void parse_params(int argc, char* argv[]) list_push(startup_services, argv[i]); } } else { - puts("Aufruf: sermgr " + puts("Aufruf: servmgr " "[Startup-Services ...]"); exit(-1); } -- 1.7.1 From kevin at tyndur.org Thu Jan 13 23:29:20 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Thu, 13 Jan 2011 23:29:20 +0100 Subject: [tyndur-devel] [PATCH 10/11] cpu: Variablennamen die Register wiederspiegeln umbenannt In-Reply-To: <1294601613-19183-10-git-send-email-m.nemo@gmx.net> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> <1294601613-19183-10-git-send-email-m.nemo@gmx.net> Message-ID: <20110113222914.GB6785@silvanus> On Sun, Jan 09, 2011 at 08:33:32PM +0100, Andreas Freimuth wrote: > * Beispiel: rax und eax in ax umbenannt > > Signed-off-by: Andreas Freimuth Hm, meinst du wirklich, dass das eine gute Idee ist? Ich glaube, wenn ich mal rumfragen würde, was sich die meisten unter ax vorstellen, wird die Mehrheit sich ein 16-Bit-Register vorstellen. Insofern verstehe ich den Sinn nicht ganz. Welchen Vorteil versprichst du dir denn von der Umbenennung? Übrigens kann ich diesen Patch nicht sauber anwenden, in amd64/cpu.c passt er angeblich nicht. From m.nemo at gmx.net Fri Jan 14 14:58:05 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Fri, 14 Jan 2011 14:58:05 +0100 Subject: [tyndur-devel] [PATCH 10/11] cpu: Variablennamen die Register wiederspiegeln umbenannt In-Reply-To: <20110113222914.GB6785@silvanus> References: <1294601613-19183-1-git-send-email-m.nemo@gmx.net> <1294601613-19183-10-git-send-email-m.nemo@gmx.net> <20110113222914.GB6785@silvanus> Message-ID: <4D30566D.3010809@gmx.net> On 13.01.2011 23:29, Kevin Wolf wrote: > On Sun, Jan 09, 2011 at 08:33:32PM +0100, Andreas Freimuth wrote: >> * Beispiel: rax und eax in ax umbenannt >> >> Signed-off-by: Andreas Freimuth > > Hm, meinst du wirklich, dass das eine gute Idee ist? > > Ich glaube, wenn ich mal rumfragen würde, was sich die meisten unter ax > vorstellen, wird die Mehrheit sich ein 16-Bit-Register vorstellen. > Insofern verstehe ich den Sinn nicht ganz. Welchen Vorteil versprichst > du dir denn von der Umbenennung? Ziel war es das Duplizieren von Code zu vermeiden, bei dem sich nur die Registernamen unterscheiden(z.B. Patch 9/11). Aber bluecode hat auch schon im IRC angemerkt, dass Register im non-arch Teil nichts zu suchen haben, wo mit er Recht hat. Von daher werde ich das ändern, und statt dessen alles in den arch Teil verschieben. > Übrigens kann ich diesen Patch nicht sauber anwenden, in amd64/cpu.c > passt er angeblich nicht. Hmm? das wundert mich. Aber aus irgend einem Grund sind es auch noch die Patches mit den alten Commit-Messages und Makefile Änderungen. From m.nemo at gmx.net Sat Jan 15 19:18:01 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:01 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_01/11=5D_kernel2=3A_TSS-Struktu?= =?utf-8?q?r_f=C3=BCr_arch/amd64?= Message-ID: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- src/kernel2/include/arch/amd64/cpu.h | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/kernel2/include/arch/amd64/cpu.h b/src/kernel2/include/arch/amd64/cpu.h index bd60f26..7444842 100644 --- a/src/kernel2/include/arch/amd64/cpu.h +++ b/src/kernel2/include/arch/amd64/cpu.h @@ -42,12 +42,6 @@ typedef uint8_t cpu_id_t; typedef struct { - cpu_id_t id; - uint8_t apic_id; - bool bootstrap; -} cpu_t; - -typedef struct { uint64_t rbx; uint64_t rcx; uint64_t rdx; @@ -74,6 +68,28 @@ typedef struct { typedef interrupt_stack_frame_t machine_state_t; +/// Task state segment +typedef struct { + uint32_t : 32; + uint64_t sp0, sp1, sp2; + uint64_t : 64; + uint64_t ist[7]; + uint64_t : 64; + uint16_t : 16; + uint16_t io_bit_map_offset; +} __attribute__((packed)) cpu_tss_t; + +// Dieser Wert muss ausserhalb des in der GDT definierten Limits +// fuer das TSS liegen +#define TSS_IO_BITMAP_NOT_LOADED UINT16_MAX + +typedef struct { + cpu_id_t id; + uint8_t apic_id; + bool bootstrap; + cpu_tss_t tss; +} cpu_t; + extern cpu_t cpus[]; extern size_t cpu_count; extern cpu_id_t cpu_id_bootstrap; -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:02 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:02 +0100 Subject: [tyndur-devel] [PATCH 02/11] kernel2: TRUE/FALSE durch true/false ersetzen In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-2-git-send-email-m.nemo@gmx.net> ! bool: Standard C Bezeichner für Boolean-Werte Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/im/im.c | 1204 ++++++++++++++-------------- src/kernel2/src/arch/amd64/mm/mm_context.c | 68 +- src/kernel2/src/arch/amd64/mm/mm_virt.c | 6 +- 3 files changed, 639 insertions(+), 639 deletions(-) diff --git a/src/kernel2/src/arch/amd64/im/im.c b/src/kernel2/src/arch/amd64/im/im.c index 2056524..88db51e 100644 --- a/src/kernel2/src/arch/amd64/im/im.c +++ b/src/kernel2/src/arch/amd64/im/im.c @@ -1,49 +1,49 @@ -/* - * Copyright (c) 2007 The tyndur Project. All rights reserved. - * - * This code is derived from software contributed to the tyndur Project - * by Antoine Kaufmann. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the tyndur Project - * and its contributors. - * 4. Neither the name of the tyndur Project nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include - -#include "kprintf.h" -#include "cpu.h" -#include "im.h" -#include "apic.h" -#include "pic.h" - -#define IDT_GATE_COUNT 256 -#define IDT_GATE_TYPE_INT 0xE -#define IDT_GATE_TYPE_TRAP 0xF +/* + * Copyright (c) 2007 The tyndur Project. All rights reserved. + * + * This code is derived from software contributed to the tyndur Project + * by Antoine Kaufmann. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the tyndur Project + * and its contributors. + * 4. Neither the name of the tyndur Project nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +#include "kprintf.h" +#include "cpu.h" +#include "im.h" +#include "apic.h" +#include "pic.h" + +#define IDT_GATE_COUNT 256 +#define IDT_GATE_TYPE_INT 0xE +#define IDT_GATE_TYPE_TRAP 0xF typedef struct { /// Die untersten 16 Bits der Handler-Adresse @@ -73,7 +73,7 @@ typedef struct { } __attribute__((packed)) idt_gate_t; -// Die ganze IDT (Achtung wird auch aus dem SMP-Trampoline-Code geladen!) +// Die ganze IDT (Achtung wird auch aus dem SMP-Trampoline-Code geladen!) idt_gate_t idt[IDT_GATE_COUNT]; bool use_apic; @@ -81,531 +81,531 @@ static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_le // Die ASM-Stubs extern void im_int_stub_0(); -extern void im_int_stub_1(); -extern void im_int_stub_2(); -extern void im_int_stub_3(); -extern void im_int_stub_4(); -extern void im_int_stub_5(); -extern void im_int_stub_6(); -extern void im_int_stub_7(); -extern void im_int_stub_8(); -extern void im_int_stub_9(); -extern void im_int_stub_10(); -extern void im_int_stub_11(); -extern void im_int_stub_12(); -extern void im_int_stub_13(); -extern void im_int_stub_14(); -extern void im_int_stub_15(); -extern void im_int_stub_16(); -extern void im_int_stub_17(); -extern void im_int_stub_18(); -extern void im_int_stub_19(); -extern void im_int_stub_20(); -extern void im_int_stub_21(); -extern void im_int_stub_22(); -extern void im_int_stub_23(); -extern void im_int_stub_24(); -extern void im_int_stub_25(); -extern void im_int_stub_26(); -extern void im_int_stub_27(); -extern void im_int_stub_28(); -extern void im_int_stub_29(); -extern void im_int_stub_30(); -extern void im_int_stub_31(); -extern void im_int_stub_32(); -extern void im_int_stub_33(); -extern void im_int_stub_34(); -extern void im_int_stub_35(); -extern void im_int_stub_36(); -extern void im_int_stub_37(); -extern void im_int_stub_38(); -extern void im_int_stub_39(); -extern void im_int_stub_40(); -extern void im_int_stub_41(); -extern void im_int_stub_42(); -extern void im_int_stub_43(); -extern void im_int_stub_44(); -extern void im_int_stub_45(); -extern void im_int_stub_46(); -extern void im_int_stub_47(); -extern void im_int_stub_48(); -extern void im_int_stub_49(); -extern void im_int_stub_50(); -extern void im_int_stub_51(); -extern void im_int_stub_52(); -extern void im_int_stub_53(); -extern void im_int_stub_54(); -extern void im_int_stub_55(); -extern void im_int_stub_56(); -extern void im_int_stub_57(); -extern void im_int_stub_58(); -extern void im_int_stub_59(); -extern void im_int_stub_60(); -extern void im_int_stub_61(); -extern void im_int_stub_62(); -extern void im_int_stub_63(); -extern void im_int_stub_64(); -extern void im_int_stub_65(); -extern void im_int_stub_66(); -extern void im_int_stub_67(); -extern void im_int_stub_68(); -extern void im_int_stub_69(); -extern void im_int_stub_70(); -extern void im_int_stub_71(); -extern void im_int_stub_72(); -extern void im_int_stub_73(); -extern void im_int_stub_74(); -extern void im_int_stub_75(); -extern void im_int_stub_76(); -extern void im_int_stub_77(); -extern void im_int_stub_78(); -extern void im_int_stub_79(); -extern void im_int_stub_80(); -extern void im_int_stub_81(); -extern void im_int_stub_82(); -extern void im_int_stub_83(); -extern void im_int_stub_84(); -extern void im_int_stub_85(); -extern void im_int_stub_86(); -extern void im_int_stub_87(); -extern void im_int_stub_88(); -extern void im_int_stub_89(); -extern void im_int_stub_90(); -extern void im_int_stub_91(); -extern void im_int_stub_92(); -extern void im_int_stub_93(); -extern void im_int_stub_94(); -extern void im_int_stub_95(); -extern void im_int_stub_96(); -extern void im_int_stub_97(); -extern void im_int_stub_98(); -extern void im_int_stub_99(); -extern void im_int_stub_100(); -extern void im_int_stub_101(); -extern void im_int_stub_102(); -extern void im_int_stub_103(); -extern void im_int_stub_104(); -extern void im_int_stub_105(); -extern void im_int_stub_106(); -extern void im_int_stub_107(); -extern void im_int_stub_108(); -extern void im_int_stub_109(); -extern void im_int_stub_110(); -extern void im_int_stub_111(); -extern void im_int_stub_112(); -extern void im_int_stub_113(); -extern void im_int_stub_114(); -extern void im_int_stub_115(); -extern void im_int_stub_116(); -extern void im_int_stub_117(); -extern void im_int_stub_118(); -extern void im_int_stub_119(); -extern void im_int_stub_120(); -extern void im_int_stub_121(); -extern void im_int_stub_122(); -extern void im_int_stub_123(); -extern void im_int_stub_124(); -extern void im_int_stub_125(); -extern void im_int_stub_126(); -extern void im_int_stub_127(); -extern void im_int_stub_128(); -extern void im_int_stub_129(); -extern void im_int_stub_130(); -extern void im_int_stub_131(); -extern void im_int_stub_132(); -extern void im_int_stub_133(); -extern void im_int_stub_134(); -extern void im_int_stub_135(); -extern void im_int_stub_136(); -extern void im_int_stub_137(); -extern void im_int_stub_138(); -extern void im_int_stub_139(); -extern void im_int_stub_140(); -extern void im_int_stub_141(); -extern void im_int_stub_142(); -extern void im_int_stub_143(); -extern void im_int_stub_144(); -extern void im_int_stub_145(); -extern void im_int_stub_146(); -extern void im_int_stub_147(); -extern void im_int_stub_148(); -extern void im_int_stub_149(); -extern void im_int_stub_150(); -extern void im_int_stub_151(); -extern void im_int_stub_152(); -extern void im_int_stub_153(); -extern void im_int_stub_154(); -extern void im_int_stub_155(); -extern void im_int_stub_156(); -extern void im_int_stub_157(); -extern void im_int_stub_158(); -extern void im_int_stub_159(); -extern void im_int_stub_160(); -extern void im_int_stub_161(); -extern void im_int_stub_162(); -extern void im_int_stub_163(); -extern void im_int_stub_164(); -extern void im_int_stub_165(); -extern void im_int_stub_166(); -extern void im_int_stub_167(); -extern void im_int_stub_168(); -extern void im_int_stub_169(); -extern void im_int_stub_170(); -extern void im_int_stub_171(); -extern void im_int_stub_172(); -extern void im_int_stub_173(); -extern void im_int_stub_174(); -extern void im_int_stub_175(); -extern void im_int_stub_176(); -extern void im_int_stub_177(); -extern void im_int_stub_178(); -extern void im_int_stub_179(); -extern void im_int_stub_180(); -extern void im_int_stub_181(); -extern void im_int_stub_182(); -extern void im_int_stub_183(); -extern void im_int_stub_184(); -extern void im_int_stub_185(); -extern void im_int_stub_186(); -extern void im_int_stub_187(); -extern void im_int_stub_188(); -extern void im_int_stub_189(); -extern void im_int_stub_190(); -extern void im_int_stub_191(); -extern void im_int_stub_192(); -extern void im_int_stub_193(); -extern void im_int_stub_194(); -extern void im_int_stub_195(); -extern void im_int_stub_196(); -extern void im_int_stub_197(); -extern void im_int_stub_198(); -extern void im_int_stub_199(); -extern void im_int_stub_200(); -extern void im_int_stub_201(); -extern void im_int_stub_202(); -extern void im_int_stub_203(); -extern void im_int_stub_204(); -extern void im_int_stub_205(); -extern void im_int_stub_206(); -extern void im_int_stub_207(); -extern void im_int_stub_208(); -extern void im_int_stub_209(); -extern void im_int_stub_210(); -extern void im_int_stub_211(); -extern void im_int_stub_212(); -extern void im_int_stub_213(); -extern void im_int_stub_214(); -extern void im_int_stub_215(); -extern void im_int_stub_216(); -extern void im_int_stub_217(); -extern void im_int_stub_218(); -extern void im_int_stub_219(); -extern void im_int_stub_220(); -extern void im_int_stub_221(); -extern void im_int_stub_222(); -extern void im_int_stub_223(); -extern void im_int_stub_224(); -extern void im_int_stub_225(); -extern void im_int_stub_226(); -extern void im_int_stub_227(); -extern void im_int_stub_228(); -extern void im_int_stub_229(); -extern void im_int_stub_230(); -extern void im_int_stub_231(); -extern void im_int_stub_232(); -extern void im_int_stub_233(); -extern void im_int_stub_234(); -extern void im_int_stub_235(); -extern void im_int_stub_236(); -extern void im_int_stub_237(); -extern void im_int_stub_238(); -extern void im_int_stub_239(); -extern void im_int_stub_240(); -extern void im_int_stub_241(); -extern void im_int_stub_242(); -extern void im_int_stub_243(); -extern void im_int_stub_244(); -extern void im_int_stub_245(); -extern void im_int_stub_246(); -extern void im_int_stub_247(); -extern void im_int_stub_248(); -extern void im_int_stub_249(); -extern void im_int_stub_250(); -extern void im_int_stub_251(); -extern void im_int_stub_252(); -extern void im_int_stub_253(); -extern void im_int_stub_254(); -extern void im_int_stub_255(); - -/** - * Die IDT-Eintraege vorbereiten - */ -void im_init() -{ - idt_set_gate(0, &im_int_stub_0, 0); - idt_set_gate(1, &im_int_stub_1, 0); - idt_set_gate(2, &im_int_stub_2, 0); - idt_set_gate(3, &im_int_stub_3, 0); - idt_set_gate(4, &im_int_stub_4, 0); - idt_set_gate(5, &im_int_stub_5, 0); - idt_set_gate(6, &im_int_stub_6, 0); - idt_set_gate(7, &im_int_stub_7, 0); - idt_set_gate(8, &im_int_stub_8, 0); - idt_set_gate(9, &im_int_stub_9, 0); - idt_set_gate(10, &im_int_stub_10, 0); - idt_set_gate(11, &im_int_stub_11, 0); - idt_set_gate(12, &im_int_stub_12, 0); - idt_set_gate(13, &im_int_stub_13, 0); - idt_set_gate(14, &im_int_stub_14, 0); - idt_set_gate(15, &im_int_stub_15, 0); - idt_set_gate(16, &im_int_stub_16, 0); - idt_set_gate(17, &im_int_stub_17, 0); - idt_set_gate(18, &im_int_stub_18, 0); - idt_set_gate(19, &im_int_stub_19, 0); - idt_set_gate(20, &im_int_stub_20, 0); - idt_set_gate(21, &im_int_stub_21, 0); - idt_set_gate(22, &im_int_stub_22, 0); - idt_set_gate(23, &im_int_stub_23, 0); - idt_set_gate(24, &im_int_stub_24, 0); - idt_set_gate(25, &im_int_stub_25, 0); - idt_set_gate(26, &im_int_stub_26, 0); - idt_set_gate(27, &im_int_stub_27, 0); - idt_set_gate(28, &im_int_stub_28, 0); - idt_set_gate(29, &im_int_stub_29, 0); - idt_set_gate(30, &im_int_stub_30, 0); - idt_set_gate(31, &im_int_stub_31, 0); - idt_set_gate(32, &im_int_stub_32, 0); - idt_set_gate(33, &im_int_stub_33, 0); - idt_set_gate(34, &im_int_stub_34, 0); - idt_set_gate(35, &im_int_stub_35, 0); - idt_set_gate(36, &im_int_stub_36, 0); - idt_set_gate(37, &im_int_stub_37, 0); - idt_set_gate(38, &im_int_stub_38, 0); - idt_set_gate(39, &im_int_stub_39, 0); - idt_set_gate(40, &im_int_stub_40, 0); - idt_set_gate(41, &im_int_stub_41, 0); - idt_set_gate(42, &im_int_stub_42, 0); - idt_set_gate(43, &im_int_stub_43, 0); - idt_set_gate(44, &im_int_stub_44, 0); - idt_set_gate(45, &im_int_stub_45, 0); - idt_set_gate(46, &im_int_stub_46, 0); - idt_set_gate(47, &im_int_stub_47, 0); - idt_set_gate(48, &im_int_stub_48, 0); - idt_set_gate(49, &im_int_stub_49, 0); - idt_set_gate(50, &im_int_stub_50, 0); - idt_set_gate(51, &im_int_stub_51, 0); - idt_set_gate(52, &im_int_stub_52, 0); - idt_set_gate(53, &im_int_stub_53, 0); - idt_set_gate(54, &im_int_stub_54, 0); - idt_set_gate(55, &im_int_stub_55, 0); - idt_set_gate(56, &im_int_stub_56, 0); - idt_set_gate(57, &im_int_stub_57, 0); - idt_set_gate(58, &im_int_stub_58, 0); - idt_set_gate(59, &im_int_stub_59, 0); - idt_set_gate(60, &im_int_stub_60, 0); - idt_set_gate(61, &im_int_stub_61, 0); - idt_set_gate(62, &im_int_stub_62, 0); - idt_set_gate(63, &im_int_stub_63, 0); - idt_set_gate(64, &im_int_stub_64, 0); - idt_set_gate(65, &im_int_stub_65, 0); - idt_set_gate(66, &im_int_stub_66, 0); - idt_set_gate(67, &im_int_stub_67, 0); - idt_set_gate(68, &im_int_stub_68, 0); - idt_set_gate(69, &im_int_stub_69, 0); - idt_set_gate(70, &im_int_stub_70, 0); - idt_set_gate(71, &im_int_stub_71, 0); - idt_set_gate(72, &im_int_stub_72, 0); - idt_set_gate(73, &im_int_stub_73, 0); - idt_set_gate(74, &im_int_stub_74, 0); - idt_set_gate(75, &im_int_stub_75, 0); - idt_set_gate(76, &im_int_stub_76, 0); - idt_set_gate(77, &im_int_stub_77, 0); - idt_set_gate(78, &im_int_stub_78, 0); - idt_set_gate(79, &im_int_stub_79, 0); - idt_set_gate(80, &im_int_stub_80, 0); - idt_set_gate(81, &im_int_stub_81, 0); - idt_set_gate(82, &im_int_stub_82, 0); - idt_set_gate(83, &im_int_stub_83, 0); - idt_set_gate(84, &im_int_stub_84, 0); - idt_set_gate(85, &im_int_stub_85, 0); - idt_set_gate(86, &im_int_stub_86, 0); - idt_set_gate(87, &im_int_stub_87, 0); - idt_set_gate(88, &im_int_stub_88, 0); - idt_set_gate(89, &im_int_stub_89, 0); - idt_set_gate(90, &im_int_stub_90, 0); - idt_set_gate(91, &im_int_stub_91, 0); - idt_set_gate(92, &im_int_stub_92, 0); - idt_set_gate(93, &im_int_stub_93, 0); - idt_set_gate(94, &im_int_stub_94, 0); - idt_set_gate(95, &im_int_stub_95, 0); - idt_set_gate(96, &im_int_stub_96, 0); - idt_set_gate(97, &im_int_stub_97, 0); - idt_set_gate(98, &im_int_stub_98, 0); - idt_set_gate(99, &im_int_stub_99, 0); - idt_set_gate(100, &im_int_stub_100, 0); - idt_set_gate(101, &im_int_stub_101, 0); - idt_set_gate(102, &im_int_stub_102, 0); - idt_set_gate(103, &im_int_stub_103, 0); - idt_set_gate(104, &im_int_stub_104, 0); - idt_set_gate(105, &im_int_stub_105, 0); - idt_set_gate(106, &im_int_stub_106, 0); - idt_set_gate(107, &im_int_stub_107, 0); - idt_set_gate(108, &im_int_stub_108, 0); - idt_set_gate(109, &im_int_stub_109, 0); - idt_set_gate(110, &im_int_stub_110, 0); - idt_set_gate(111, &im_int_stub_111, 0); - idt_set_gate(112, &im_int_stub_112, 0); - idt_set_gate(113, &im_int_stub_113, 0); - idt_set_gate(114, &im_int_stub_114, 0); - idt_set_gate(115, &im_int_stub_115, 0); - idt_set_gate(116, &im_int_stub_116, 0); - idt_set_gate(117, &im_int_stub_117, 0); - idt_set_gate(118, &im_int_stub_118, 0); - idt_set_gate(119, &im_int_stub_119, 0); - idt_set_gate(120, &im_int_stub_120, 0); - idt_set_gate(121, &im_int_stub_121, 0); - idt_set_gate(122, &im_int_stub_122, 0); - idt_set_gate(123, &im_int_stub_123, 0); - idt_set_gate(124, &im_int_stub_124, 0); - idt_set_gate(125, &im_int_stub_125, 0); - idt_set_gate(126, &im_int_stub_126, 0); - idt_set_gate(127, &im_int_stub_127, 0); - idt_set_gate(128, &im_int_stub_128, 0); - idt_set_gate(129, &im_int_stub_129, 0); - idt_set_gate(130, &im_int_stub_130, 0); - idt_set_gate(131, &im_int_stub_131, 0); - idt_set_gate(132, &im_int_stub_132, 0); - idt_set_gate(133, &im_int_stub_133, 0); - idt_set_gate(134, &im_int_stub_134, 0); - idt_set_gate(135, &im_int_stub_135, 0); - idt_set_gate(136, &im_int_stub_136, 0); - idt_set_gate(137, &im_int_stub_137, 0); - idt_set_gate(138, &im_int_stub_138, 0); - idt_set_gate(139, &im_int_stub_139, 0); - idt_set_gate(140, &im_int_stub_140, 0); - idt_set_gate(141, &im_int_stub_141, 0); - idt_set_gate(142, &im_int_stub_142, 0); - idt_set_gate(143, &im_int_stub_143, 0); - idt_set_gate(144, &im_int_stub_144, 0); - idt_set_gate(145, &im_int_stub_145, 0); - idt_set_gate(146, &im_int_stub_146, 0); - idt_set_gate(147, &im_int_stub_147, 0); - idt_set_gate(148, &im_int_stub_148, 0); - idt_set_gate(149, &im_int_stub_149, 0); - idt_set_gate(150, &im_int_stub_150, 0); - idt_set_gate(151, &im_int_stub_151, 0); - idt_set_gate(152, &im_int_stub_152, 0); - idt_set_gate(153, &im_int_stub_153, 0); - idt_set_gate(154, &im_int_stub_154, 0); - idt_set_gate(155, &im_int_stub_155, 0); - idt_set_gate(156, &im_int_stub_156, 0); - idt_set_gate(157, &im_int_stub_157, 0); - idt_set_gate(158, &im_int_stub_158, 0); - idt_set_gate(159, &im_int_stub_159, 0); - idt_set_gate(160, &im_int_stub_160, 0); - idt_set_gate(161, &im_int_stub_161, 0); - idt_set_gate(162, &im_int_stub_162, 0); - idt_set_gate(163, &im_int_stub_163, 0); - idt_set_gate(164, &im_int_stub_164, 0); - idt_set_gate(165, &im_int_stub_165, 0); - idt_set_gate(166, &im_int_stub_166, 0); - idt_set_gate(167, &im_int_stub_167, 0); - idt_set_gate(168, &im_int_stub_168, 0); - idt_set_gate(169, &im_int_stub_169, 0); - idt_set_gate(170, &im_int_stub_170, 0); - idt_set_gate(171, &im_int_stub_171, 0); - idt_set_gate(172, &im_int_stub_172, 0); - idt_set_gate(173, &im_int_stub_173, 0); - idt_set_gate(174, &im_int_stub_174, 0); - idt_set_gate(175, &im_int_stub_175, 0); - idt_set_gate(176, &im_int_stub_176, 0); - idt_set_gate(177, &im_int_stub_177, 0); - idt_set_gate(178, &im_int_stub_178, 0); - idt_set_gate(179, &im_int_stub_179, 0); - idt_set_gate(180, &im_int_stub_180, 0); - idt_set_gate(181, &im_int_stub_181, 0); - idt_set_gate(182, &im_int_stub_182, 0); - idt_set_gate(183, &im_int_stub_183, 0); - idt_set_gate(184, &im_int_stub_184, 0); - idt_set_gate(185, &im_int_stub_185, 0); - idt_set_gate(186, &im_int_stub_186, 0); - idt_set_gate(187, &im_int_stub_187, 0); - idt_set_gate(188, &im_int_stub_188, 0); - idt_set_gate(189, &im_int_stub_189, 0); - idt_set_gate(190, &im_int_stub_190, 0); - idt_set_gate(191, &im_int_stub_191, 0); - idt_set_gate(192, &im_int_stub_192, 0); - idt_set_gate(193, &im_int_stub_193, 0); - idt_set_gate(194, &im_int_stub_194, 0); - idt_set_gate(195, &im_int_stub_195, 0); - idt_set_gate(196, &im_int_stub_196, 0); - idt_set_gate(197, &im_int_stub_197, 0); - idt_set_gate(198, &im_int_stub_198, 0); - idt_set_gate(199, &im_int_stub_199, 0); - idt_set_gate(200, &im_int_stub_200, 0); - idt_set_gate(201, &im_int_stub_201, 0); - idt_set_gate(202, &im_int_stub_202, 0); - idt_set_gate(203, &im_int_stub_203, 0); - idt_set_gate(204, &im_int_stub_204, 0); - idt_set_gate(205, &im_int_stub_205, 0); - idt_set_gate(206, &im_int_stub_206, 0); - idt_set_gate(207, &im_int_stub_207, 0); - idt_set_gate(208, &im_int_stub_208, 0); - idt_set_gate(209, &im_int_stub_209, 0); - idt_set_gate(210, &im_int_stub_210, 0); - idt_set_gate(211, &im_int_stub_211, 0); - idt_set_gate(212, &im_int_stub_212, 0); - idt_set_gate(213, &im_int_stub_213, 0); - idt_set_gate(214, &im_int_stub_214, 0); - idt_set_gate(215, &im_int_stub_215, 0); - idt_set_gate(216, &im_int_stub_216, 0); - idt_set_gate(217, &im_int_stub_217, 0); - idt_set_gate(218, &im_int_stub_218, 0); - idt_set_gate(219, &im_int_stub_219, 0); - idt_set_gate(220, &im_int_stub_220, 0); - idt_set_gate(221, &im_int_stub_221, 0); - idt_set_gate(222, &im_int_stub_222, 0); - idt_set_gate(223, &im_int_stub_223, 0); - idt_set_gate(224, &im_int_stub_224, 0); - idt_set_gate(225, &im_int_stub_225, 0); - idt_set_gate(226, &im_int_stub_226, 0); - idt_set_gate(227, &im_int_stub_227, 0); - idt_set_gate(228, &im_int_stub_228, 0); - idt_set_gate(229, &im_int_stub_229, 0); - idt_set_gate(230, &im_int_stub_230, 0); - idt_set_gate(231, &im_int_stub_231, 0); - idt_set_gate(232, &im_int_stub_232, 0); - idt_set_gate(233, &im_int_stub_233, 0); - idt_set_gate(234, &im_int_stub_234, 0); - idt_set_gate(235, &im_int_stub_235, 0); - idt_set_gate(236, &im_int_stub_236, 0); - idt_set_gate(237, &im_int_stub_237, 0); - idt_set_gate(238, &im_int_stub_238, 0); - idt_set_gate(239, &im_int_stub_239, 0); - idt_set_gate(240, &im_int_stub_240, 0); - idt_set_gate(241, &im_int_stub_241, 0); - idt_set_gate(242, &im_int_stub_242, 0); - idt_set_gate(243, &im_int_stub_243, 0); - idt_set_gate(244, &im_int_stub_244, 0); - idt_set_gate(245, &im_int_stub_245, 0); - idt_set_gate(246, &im_int_stub_246, 0); - idt_set_gate(247, &im_int_stub_247, 0); - idt_set_gate(248, &im_int_stub_248, 0); - idt_set_gate(249, &im_int_stub_249, 0); - idt_set_gate(250, &im_int_stub_250, 0); - idt_set_gate(251, &im_int_stub_251, 0); - idt_set_gate(252, &im_int_stub_252, 0); - idt_set_gate(253, &im_int_stub_253, 0); - idt_set_gate(254, &im_int_stub_254, 0); - idt_set_gate(255, &im_int_stub_255, 0); - - use_apic = TRUE; -} - -/** - * Die IDT laden und Interrupts aktivieren. - */ -void im_enable() +extern void im_int_stub_1(); +extern void im_int_stub_2(); +extern void im_int_stub_3(); +extern void im_int_stub_4(); +extern void im_int_stub_5(); +extern void im_int_stub_6(); +extern void im_int_stub_7(); +extern void im_int_stub_8(); +extern void im_int_stub_9(); +extern void im_int_stub_10(); +extern void im_int_stub_11(); +extern void im_int_stub_12(); +extern void im_int_stub_13(); +extern void im_int_stub_14(); +extern void im_int_stub_15(); +extern void im_int_stub_16(); +extern void im_int_stub_17(); +extern void im_int_stub_18(); +extern void im_int_stub_19(); +extern void im_int_stub_20(); +extern void im_int_stub_21(); +extern void im_int_stub_22(); +extern void im_int_stub_23(); +extern void im_int_stub_24(); +extern void im_int_stub_25(); +extern void im_int_stub_26(); +extern void im_int_stub_27(); +extern void im_int_stub_28(); +extern void im_int_stub_29(); +extern void im_int_stub_30(); +extern void im_int_stub_31(); +extern void im_int_stub_32(); +extern void im_int_stub_33(); +extern void im_int_stub_34(); +extern void im_int_stub_35(); +extern void im_int_stub_36(); +extern void im_int_stub_37(); +extern void im_int_stub_38(); +extern void im_int_stub_39(); +extern void im_int_stub_40(); +extern void im_int_stub_41(); +extern void im_int_stub_42(); +extern void im_int_stub_43(); +extern void im_int_stub_44(); +extern void im_int_stub_45(); +extern void im_int_stub_46(); +extern void im_int_stub_47(); +extern void im_int_stub_48(); +extern void im_int_stub_49(); +extern void im_int_stub_50(); +extern void im_int_stub_51(); +extern void im_int_stub_52(); +extern void im_int_stub_53(); +extern void im_int_stub_54(); +extern void im_int_stub_55(); +extern void im_int_stub_56(); +extern void im_int_stub_57(); +extern void im_int_stub_58(); +extern void im_int_stub_59(); +extern void im_int_stub_60(); +extern void im_int_stub_61(); +extern void im_int_stub_62(); +extern void im_int_stub_63(); +extern void im_int_stub_64(); +extern void im_int_stub_65(); +extern void im_int_stub_66(); +extern void im_int_stub_67(); +extern void im_int_stub_68(); +extern void im_int_stub_69(); +extern void im_int_stub_70(); +extern void im_int_stub_71(); +extern void im_int_stub_72(); +extern void im_int_stub_73(); +extern void im_int_stub_74(); +extern void im_int_stub_75(); +extern void im_int_stub_76(); +extern void im_int_stub_77(); +extern void im_int_stub_78(); +extern void im_int_stub_79(); +extern void im_int_stub_80(); +extern void im_int_stub_81(); +extern void im_int_stub_82(); +extern void im_int_stub_83(); +extern void im_int_stub_84(); +extern void im_int_stub_85(); +extern void im_int_stub_86(); +extern void im_int_stub_87(); +extern void im_int_stub_88(); +extern void im_int_stub_89(); +extern void im_int_stub_90(); +extern void im_int_stub_91(); +extern void im_int_stub_92(); +extern void im_int_stub_93(); +extern void im_int_stub_94(); +extern void im_int_stub_95(); +extern void im_int_stub_96(); +extern void im_int_stub_97(); +extern void im_int_stub_98(); +extern void im_int_stub_99(); +extern void im_int_stub_100(); +extern void im_int_stub_101(); +extern void im_int_stub_102(); +extern void im_int_stub_103(); +extern void im_int_stub_104(); +extern void im_int_stub_105(); +extern void im_int_stub_106(); +extern void im_int_stub_107(); +extern void im_int_stub_108(); +extern void im_int_stub_109(); +extern void im_int_stub_110(); +extern void im_int_stub_111(); +extern void im_int_stub_112(); +extern void im_int_stub_113(); +extern void im_int_stub_114(); +extern void im_int_stub_115(); +extern void im_int_stub_116(); +extern void im_int_stub_117(); +extern void im_int_stub_118(); +extern void im_int_stub_119(); +extern void im_int_stub_120(); +extern void im_int_stub_121(); +extern void im_int_stub_122(); +extern void im_int_stub_123(); +extern void im_int_stub_124(); +extern void im_int_stub_125(); +extern void im_int_stub_126(); +extern void im_int_stub_127(); +extern void im_int_stub_128(); +extern void im_int_stub_129(); +extern void im_int_stub_130(); +extern void im_int_stub_131(); +extern void im_int_stub_132(); +extern void im_int_stub_133(); +extern void im_int_stub_134(); +extern void im_int_stub_135(); +extern void im_int_stub_136(); +extern void im_int_stub_137(); +extern void im_int_stub_138(); +extern void im_int_stub_139(); +extern void im_int_stub_140(); +extern void im_int_stub_141(); +extern void im_int_stub_142(); +extern void im_int_stub_143(); +extern void im_int_stub_144(); +extern void im_int_stub_145(); +extern void im_int_stub_146(); +extern void im_int_stub_147(); +extern void im_int_stub_148(); +extern void im_int_stub_149(); +extern void im_int_stub_150(); +extern void im_int_stub_151(); +extern void im_int_stub_152(); +extern void im_int_stub_153(); +extern void im_int_stub_154(); +extern void im_int_stub_155(); +extern void im_int_stub_156(); +extern void im_int_stub_157(); +extern void im_int_stub_158(); +extern void im_int_stub_159(); +extern void im_int_stub_160(); +extern void im_int_stub_161(); +extern void im_int_stub_162(); +extern void im_int_stub_163(); +extern void im_int_stub_164(); +extern void im_int_stub_165(); +extern void im_int_stub_166(); +extern void im_int_stub_167(); +extern void im_int_stub_168(); +extern void im_int_stub_169(); +extern void im_int_stub_170(); +extern void im_int_stub_171(); +extern void im_int_stub_172(); +extern void im_int_stub_173(); +extern void im_int_stub_174(); +extern void im_int_stub_175(); +extern void im_int_stub_176(); +extern void im_int_stub_177(); +extern void im_int_stub_178(); +extern void im_int_stub_179(); +extern void im_int_stub_180(); +extern void im_int_stub_181(); +extern void im_int_stub_182(); +extern void im_int_stub_183(); +extern void im_int_stub_184(); +extern void im_int_stub_185(); +extern void im_int_stub_186(); +extern void im_int_stub_187(); +extern void im_int_stub_188(); +extern void im_int_stub_189(); +extern void im_int_stub_190(); +extern void im_int_stub_191(); +extern void im_int_stub_192(); +extern void im_int_stub_193(); +extern void im_int_stub_194(); +extern void im_int_stub_195(); +extern void im_int_stub_196(); +extern void im_int_stub_197(); +extern void im_int_stub_198(); +extern void im_int_stub_199(); +extern void im_int_stub_200(); +extern void im_int_stub_201(); +extern void im_int_stub_202(); +extern void im_int_stub_203(); +extern void im_int_stub_204(); +extern void im_int_stub_205(); +extern void im_int_stub_206(); +extern void im_int_stub_207(); +extern void im_int_stub_208(); +extern void im_int_stub_209(); +extern void im_int_stub_210(); +extern void im_int_stub_211(); +extern void im_int_stub_212(); +extern void im_int_stub_213(); +extern void im_int_stub_214(); +extern void im_int_stub_215(); +extern void im_int_stub_216(); +extern void im_int_stub_217(); +extern void im_int_stub_218(); +extern void im_int_stub_219(); +extern void im_int_stub_220(); +extern void im_int_stub_221(); +extern void im_int_stub_222(); +extern void im_int_stub_223(); +extern void im_int_stub_224(); +extern void im_int_stub_225(); +extern void im_int_stub_226(); +extern void im_int_stub_227(); +extern void im_int_stub_228(); +extern void im_int_stub_229(); +extern void im_int_stub_230(); +extern void im_int_stub_231(); +extern void im_int_stub_232(); +extern void im_int_stub_233(); +extern void im_int_stub_234(); +extern void im_int_stub_235(); +extern void im_int_stub_236(); +extern void im_int_stub_237(); +extern void im_int_stub_238(); +extern void im_int_stub_239(); +extern void im_int_stub_240(); +extern void im_int_stub_241(); +extern void im_int_stub_242(); +extern void im_int_stub_243(); +extern void im_int_stub_244(); +extern void im_int_stub_245(); +extern void im_int_stub_246(); +extern void im_int_stub_247(); +extern void im_int_stub_248(); +extern void im_int_stub_249(); +extern void im_int_stub_250(); +extern void im_int_stub_251(); +extern void im_int_stub_252(); +extern void im_int_stub_253(); +extern void im_int_stub_254(); +extern void im_int_stub_255(); + +/** + * Die IDT-Eintraege vorbereiten + */ +void im_init() +{ + idt_set_gate(0, &im_int_stub_0, 0); + idt_set_gate(1, &im_int_stub_1, 0); + idt_set_gate(2, &im_int_stub_2, 0); + idt_set_gate(3, &im_int_stub_3, 0); + idt_set_gate(4, &im_int_stub_4, 0); + idt_set_gate(5, &im_int_stub_5, 0); + idt_set_gate(6, &im_int_stub_6, 0); + idt_set_gate(7, &im_int_stub_7, 0); + idt_set_gate(8, &im_int_stub_8, 0); + idt_set_gate(9, &im_int_stub_9, 0); + idt_set_gate(10, &im_int_stub_10, 0); + idt_set_gate(11, &im_int_stub_11, 0); + idt_set_gate(12, &im_int_stub_12, 0); + idt_set_gate(13, &im_int_stub_13, 0); + idt_set_gate(14, &im_int_stub_14, 0); + idt_set_gate(15, &im_int_stub_15, 0); + idt_set_gate(16, &im_int_stub_16, 0); + idt_set_gate(17, &im_int_stub_17, 0); + idt_set_gate(18, &im_int_stub_18, 0); + idt_set_gate(19, &im_int_stub_19, 0); + idt_set_gate(20, &im_int_stub_20, 0); + idt_set_gate(21, &im_int_stub_21, 0); + idt_set_gate(22, &im_int_stub_22, 0); + idt_set_gate(23, &im_int_stub_23, 0); + idt_set_gate(24, &im_int_stub_24, 0); + idt_set_gate(25, &im_int_stub_25, 0); + idt_set_gate(26, &im_int_stub_26, 0); + idt_set_gate(27, &im_int_stub_27, 0); + idt_set_gate(28, &im_int_stub_28, 0); + idt_set_gate(29, &im_int_stub_29, 0); + idt_set_gate(30, &im_int_stub_30, 0); + idt_set_gate(31, &im_int_stub_31, 0); + idt_set_gate(32, &im_int_stub_32, 0); + idt_set_gate(33, &im_int_stub_33, 0); + idt_set_gate(34, &im_int_stub_34, 0); + idt_set_gate(35, &im_int_stub_35, 0); + idt_set_gate(36, &im_int_stub_36, 0); + idt_set_gate(37, &im_int_stub_37, 0); + idt_set_gate(38, &im_int_stub_38, 0); + idt_set_gate(39, &im_int_stub_39, 0); + idt_set_gate(40, &im_int_stub_40, 0); + idt_set_gate(41, &im_int_stub_41, 0); + idt_set_gate(42, &im_int_stub_42, 0); + idt_set_gate(43, &im_int_stub_43, 0); + idt_set_gate(44, &im_int_stub_44, 0); + idt_set_gate(45, &im_int_stub_45, 0); + idt_set_gate(46, &im_int_stub_46, 0); + idt_set_gate(47, &im_int_stub_47, 0); + idt_set_gate(48, &im_int_stub_48, 0); + idt_set_gate(49, &im_int_stub_49, 0); + idt_set_gate(50, &im_int_stub_50, 0); + idt_set_gate(51, &im_int_stub_51, 0); + idt_set_gate(52, &im_int_stub_52, 0); + idt_set_gate(53, &im_int_stub_53, 0); + idt_set_gate(54, &im_int_stub_54, 0); + idt_set_gate(55, &im_int_stub_55, 0); + idt_set_gate(56, &im_int_stub_56, 0); + idt_set_gate(57, &im_int_stub_57, 0); + idt_set_gate(58, &im_int_stub_58, 0); + idt_set_gate(59, &im_int_stub_59, 0); + idt_set_gate(60, &im_int_stub_60, 0); + idt_set_gate(61, &im_int_stub_61, 0); + idt_set_gate(62, &im_int_stub_62, 0); + idt_set_gate(63, &im_int_stub_63, 0); + idt_set_gate(64, &im_int_stub_64, 0); + idt_set_gate(65, &im_int_stub_65, 0); + idt_set_gate(66, &im_int_stub_66, 0); + idt_set_gate(67, &im_int_stub_67, 0); + idt_set_gate(68, &im_int_stub_68, 0); + idt_set_gate(69, &im_int_stub_69, 0); + idt_set_gate(70, &im_int_stub_70, 0); + idt_set_gate(71, &im_int_stub_71, 0); + idt_set_gate(72, &im_int_stub_72, 0); + idt_set_gate(73, &im_int_stub_73, 0); + idt_set_gate(74, &im_int_stub_74, 0); + idt_set_gate(75, &im_int_stub_75, 0); + idt_set_gate(76, &im_int_stub_76, 0); + idt_set_gate(77, &im_int_stub_77, 0); + idt_set_gate(78, &im_int_stub_78, 0); + idt_set_gate(79, &im_int_stub_79, 0); + idt_set_gate(80, &im_int_stub_80, 0); + idt_set_gate(81, &im_int_stub_81, 0); + idt_set_gate(82, &im_int_stub_82, 0); + idt_set_gate(83, &im_int_stub_83, 0); + idt_set_gate(84, &im_int_stub_84, 0); + idt_set_gate(85, &im_int_stub_85, 0); + idt_set_gate(86, &im_int_stub_86, 0); + idt_set_gate(87, &im_int_stub_87, 0); + idt_set_gate(88, &im_int_stub_88, 0); + idt_set_gate(89, &im_int_stub_89, 0); + idt_set_gate(90, &im_int_stub_90, 0); + idt_set_gate(91, &im_int_stub_91, 0); + idt_set_gate(92, &im_int_stub_92, 0); + idt_set_gate(93, &im_int_stub_93, 0); + idt_set_gate(94, &im_int_stub_94, 0); + idt_set_gate(95, &im_int_stub_95, 0); + idt_set_gate(96, &im_int_stub_96, 0); + idt_set_gate(97, &im_int_stub_97, 0); + idt_set_gate(98, &im_int_stub_98, 0); + idt_set_gate(99, &im_int_stub_99, 0); + idt_set_gate(100, &im_int_stub_100, 0); + idt_set_gate(101, &im_int_stub_101, 0); + idt_set_gate(102, &im_int_stub_102, 0); + idt_set_gate(103, &im_int_stub_103, 0); + idt_set_gate(104, &im_int_stub_104, 0); + idt_set_gate(105, &im_int_stub_105, 0); + idt_set_gate(106, &im_int_stub_106, 0); + idt_set_gate(107, &im_int_stub_107, 0); + idt_set_gate(108, &im_int_stub_108, 0); + idt_set_gate(109, &im_int_stub_109, 0); + idt_set_gate(110, &im_int_stub_110, 0); + idt_set_gate(111, &im_int_stub_111, 0); + idt_set_gate(112, &im_int_stub_112, 0); + idt_set_gate(113, &im_int_stub_113, 0); + idt_set_gate(114, &im_int_stub_114, 0); + idt_set_gate(115, &im_int_stub_115, 0); + idt_set_gate(116, &im_int_stub_116, 0); + idt_set_gate(117, &im_int_stub_117, 0); + idt_set_gate(118, &im_int_stub_118, 0); + idt_set_gate(119, &im_int_stub_119, 0); + idt_set_gate(120, &im_int_stub_120, 0); + idt_set_gate(121, &im_int_stub_121, 0); + idt_set_gate(122, &im_int_stub_122, 0); + idt_set_gate(123, &im_int_stub_123, 0); + idt_set_gate(124, &im_int_stub_124, 0); + idt_set_gate(125, &im_int_stub_125, 0); + idt_set_gate(126, &im_int_stub_126, 0); + idt_set_gate(127, &im_int_stub_127, 0); + idt_set_gate(128, &im_int_stub_128, 0); + idt_set_gate(129, &im_int_stub_129, 0); + idt_set_gate(130, &im_int_stub_130, 0); + idt_set_gate(131, &im_int_stub_131, 0); + idt_set_gate(132, &im_int_stub_132, 0); + idt_set_gate(133, &im_int_stub_133, 0); + idt_set_gate(134, &im_int_stub_134, 0); + idt_set_gate(135, &im_int_stub_135, 0); + idt_set_gate(136, &im_int_stub_136, 0); + idt_set_gate(137, &im_int_stub_137, 0); + idt_set_gate(138, &im_int_stub_138, 0); + idt_set_gate(139, &im_int_stub_139, 0); + idt_set_gate(140, &im_int_stub_140, 0); + idt_set_gate(141, &im_int_stub_141, 0); + idt_set_gate(142, &im_int_stub_142, 0); + idt_set_gate(143, &im_int_stub_143, 0); + idt_set_gate(144, &im_int_stub_144, 0); + idt_set_gate(145, &im_int_stub_145, 0); + idt_set_gate(146, &im_int_stub_146, 0); + idt_set_gate(147, &im_int_stub_147, 0); + idt_set_gate(148, &im_int_stub_148, 0); + idt_set_gate(149, &im_int_stub_149, 0); + idt_set_gate(150, &im_int_stub_150, 0); + idt_set_gate(151, &im_int_stub_151, 0); + idt_set_gate(152, &im_int_stub_152, 0); + idt_set_gate(153, &im_int_stub_153, 0); + idt_set_gate(154, &im_int_stub_154, 0); + idt_set_gate(155, &im_int_stub_155, 0); + idt_set_gate(156, &im_int_stub_156, 0); + idt_set_gate(157, &im_int_stub_157, 0); + idt_set_gate(158, &im_int_stub_158, 0); + idt_set_gate(159, &im_int_stub_159, 0); + idt_set_gate(160, &im_int_stub_160, 0); + idt_set_gate(161, &im_int_stub_161, 0); + idt_set_gate(162, &im_int_stub_162, 0); + idt_set_gate(163, &im_int_stub_163, 0); + idt_set_gate(164, &im_int_stub_164, 0); + idt_set_gate(165, &im_int_stub_165, 0); + idt_set_gate(166, &im_int_stub_166, 0); + idt_set_gate(167, &im_int_stub_167, 0); + idt_set_gate(168, &im_int_stub_168, 0); + idt_set_gate(169, &im_int_stub_169, 0); + idt_set_gate(170, &im_int_stub_170, 0); + idt_set_gate(171, &im_int_stub_171, 0); + idt_set_gate(172, &im_int_stub_172, 0); + idt_set_gate(173, &im_int_stub_173, 0); + idt_set_gate(174, &im_int_stub_174, 0); + idt_set_gate(175, &im_int_stub_175, 0); + idt_set_gate(176, &im_int_stub_176, 0); + idt_set_gate(177, &im_int_stub_177, 0); + idt_set_gate(178, &im_int_stub_178, 0); + idt_set_gate(179, &im_int_stub_179, 0); + idt_set_gate(180, &im_int_stub_180, 0); + idt_set_gate(181, &im_int_stub_181, 0); + idt_set_gate(182, &im_int_stub_182, 0); + idt_set_gate(183, &im_int_stub_183, 0); + idt_set_gate(184, &im_int_stub_184, 0); + idt_set_gate(185, &im_int_stub_185, 0); + idt_set_gate(186, &im_int_stub_186, 0); + idt_set_gate(187, &im_int_stub_187, 0); + idt_set_gate(188, &im_int_stub_188, 0); + idt_set_gate(189, &im_int_stub_189, 0); + idt_set_gate(190, &im_int_stub_190, 0); + idt_set_gate(191, &im_int_stub_191, 0); + idt_set_gate(192, &im_int_stub_192, 0); + idt_set_gate(193, &im_int_stub_193, 0); + idt_set_gate(194, &im_int_stub_194, 0); + idt_set_gate(195, &im_int_stub_195, 0); + idt_set_gate(196, &im_int_stub_196, 0); + idt_set_gate(197, &im_int_stub_197, 0); + idt_set_gate(198, &im_int_stub_198, 0); + idt_set_gate(199, &im_int_stub_199, 0); + idt_set_gate(200, &im_int_stub_200, 0); + idt_set_gate(201, &im_int_stub_201, 0); + idt_set_gate(202, &im_int_stub_202, 0); + idt_set_gate(203, &im_int_stub_203, 0); + idt_set_gate(204, &im_int_stub_204, 0); + idt_set_gate(205, &im_int_stub_205, 0); + idt_set_gate(206, &im_int_stub_206, 0); + idt_set_gate(207, &im_int_stub_207, 0); + idt_set_gate(208, &im_int_stub_208, 0); + idt_set_gate(209, &im_int_stub_209, 0); + idt_set_gate(210, &im_int_stub_210, 0); + idt_set_gate(211, &im_int_stub_211, 0); + idt_set_gate(212, &im_int_stub_212, 0); + idt_set_gate(213, &im_int_stub_213, 0); + idt_set_gate(214, &im_int_stub_214, 0); + idt_set_gate(215, &im_int_stub_215, 0); + idt_set_gate(216, &im_int_stub_216, 0); + idt_set_gate(217, &im_int_stub_217, 0); + idt_set_gate(218, &im_int_stub_218, 0); + idt_set_gate(219, &im_int_stub_219, 0); + idt_set_gate(220, &im_int_stub_220, 0); + idt_set_gate(221, &im_int_stub_221, 0); + idt_set_gate(222, &im_int_stub_222, 0); + idt_set_gate(223, &im_int_stub_223, 0); + idt_set_gate(224, &im_int_stub_224, 0); + idt_set_gate(225, &im_int_stub_225, 0); + idt_set_gate(226, &im_int_stub_226, 0); + idt_set_gate(227, &im_int_stub_227, 0); + idt_set_gate(228, &im_int_stub_228, 0); + idt_set_gate(229, &im_int_stub_229, 0); + idt_set_gate(230, &im_int_stub_230, 0); + idt_set_gate(231, &im_int_stub_231, 0); + idt_set_gate(232, &im_int_stub_232, 0); + idt_set_gate(233, &im_int_stub_233, 0); + idt_set_gate(234, &im_int_stub_234, 0); + idt_set_gate(235, &im_int_stub_235, 0); + idt_set_gate(236, &im_int_stub_236, 0); + idt_set_gate(237, &im_int_stub_237, 0); + idt_set_gate(238, &im_int_stub_238, 0); + idt_set_gate(239, &im_int_stub_239, 0); + idt_set_gate(240, &im_int_stub_240, 0); + idt_set_gate(241, &im_int_stub_241, 0); + idt_set_gate(242, &im_int_stub_242, 0); + idt_set_gate(243, &im_int_stub_243, 0); + idt_set_gate(244, &im_int_stub_244, 0); + idt_set_gate(245, &im_int_stub_245, 0); + idt_set_gate(246, &im_int_stub_246, 0); + idt_set_gate(247, &im_int_stub_247, 0); + idt_set_gate(248, &im_int_stub_248, 0); + idt_set_gate(249, &im_int_stub_249, 0); + idt_set_gate(250, &im_int_stub_250, 0); + idt_set_gate(251, &im_int_stub_251, 0); + idt_set_gate(252, &im_int_stub_252, 0); + idt_set_gate(253, &im_int_stub_253, 0); + idt_set_gate(254, &im_int_stub_254, 0); + idt_set_gate(255, &im_int_stub_255, 0); + + use_apic = true; +} + +/** + * Die IDT laden und Interrupts aktivieren. + */ +void im_enable() { // Register zum laden der IDT vorbereiten struct { @@ -617,13 +617,13 @@ void im_enable() }; asm("lidt %0" : : "m" (idt_ptr)); -} - -/** - * Ein Gate in der IDT setzen - * - * @param interrupt Interrupt-Nummer - * @param handler Pointer auf die Handerfunktion. +} + +/** + * Ein Gate in der IDT setzen + * + * @param interrupt Interrupt-Nummer + * @param handler Pointer auf die Handerfunktion. * @param privilege_level Bestimmt ob der Interrup fuer den Kernel- (0) oder * fuer den User-Ring (3) bestimmt ist. */ @@ -631,32 +631,32 @@ static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_le { // Handler-Adresse uintptr_t uint_handler = (uintptr_t) handler; - idt[interrupt].offset_low = uint_handler & 0xFFFF; - idt[interrupt].offset_mid = (uint_handler >> 16) & 0xFFFF; - idt[interrupt].offset_high = uint_handler >> 32; - - // TODO: Segment gehoert hier nicht hartkodiert hin - idt[interrupt].segment = 0x8; - idt[interrupt].type = IDT_GATE_TYPE_TRAP; - idt[interrupt].present = TRUE; - idt[interrupt].privilege_level = privilege_level; -} - -/** - * Muss vom plattformunabhaengigen Handler aufgerufen werden. + idt[interrupt].offset_low = uint_handler & 0xFFFF; + idt[interrupt].offset_mid = (uint_handler >> 16) & 0xFFFF; + idt[interrupt].offset_high = uint_handler >> 32; + + // TODO: Segment gehoert hier nicht hartkodiert hin + idt[interrupt].segment = 0x8; + idt[interrupt].type = IDT_GATE_TYPE_TRAP; + idt[interrupt].present = true; + idt[interrupt].privilege_level = privilege_level; +} + +/** + * Muss vom plattformunabhaengigen Handler aufgerufen werden. * * @param interrupt Interruptnummer */ void im_end_of_interrupt(uint8_t interrupt) { // Nur mit dem traditionellen PIC - if (use_apic == FALSE) { - if ((interrupt >= IM_IRQ_BASE) && (interrupt <= IM_IRQ_BASE + 16)) { - pic_eoi(interrupt - IM_IRQ_BASE); - } - } else { - // TODO: EOI an APIC - } -} - - + if (use_apic == false) { + if ((interrupt >= IM_IRQ_BASE) && (interrupt <= IM_IRQ_BASE + 16)) { + pic_eoi(interrupt - IM_IRQ_BASE); + } + } else { + // TODO: EOI an APIC + } +} + + diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index b6d5274..fed401d 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -49,7 +49,7 @@ */ /// Bestimmt ob das NX-Bit benutzt werden soll. -bool mmc_use_no_exec = FALSE; +bool mmc_use_no_exec = false; /** @@ -122,7 +122,7 @@ static void pm_free(mmc_pm_entry_t* pm) * * @param pm Pointer auf die Pagemap. Dieser muss gemappt sein. Am besten mit * pm_get. - * @param create Wenn TRUE, werden nicht existierende PDPTs erstellt und + * @param create Wenn true, werden nicht existierende PDPTs erstellt und * gemappt. * @param user Wenn die pdpt erstellt werden muss, bestimmt dieser Parameter ob * die pdpt fuer den Usermode bestimmt ist, oder nicht. @@ -138,7 +138,7 @@ static mmc_pdpt_entry_t* pdpt_get(mmc_pm_entry_t* pm, return vmm_kernel_automap((paddr_t) (pm[index] & PAGE_MASK), PAGE_SIZE); } else { - if (create == TRUE) { + if (create == true) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pdpt_entry_t* pdpt = vmm_kernel_automap(phys, PAGE_SIZE); @@ -176,7 +176,7 @@ static mmc_pd_entry_t* pd_get(mmc_pdpt_entry_t* pdpt, size_t index, return vmm_kernel_automap((paddr_t) (pdpt[index] & PAGE_MASK), PAGE_SIZE); } else { - if (create == TRUE) { + if (create == true) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pd_entry_t* pd = vmm_kernel_automap(phys, PAGE_SIZE); @@ -216,7 +216,7 @@ static mmc_pt_entry_t* pt_get(mmc_pd_entry_t* pd, size_t index, bool create, return vmm_kernel_automap((paddr_t) (pd[index] & PAGE_MASK), PAGE_SIZE); } else { - if ((create == TRUE) && ((pd[index] & 1) == 0)) { + if ((create == true) && ((pd[index] & 1) == 0)) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pt_entry_t* pt = vmm_kernel_automap(phys, PAGE_SIZE); @@ -251,7 +251,7 @@ static void pt_free(mmc_pt_entry_t* pt) * * @param context Kontext aus dem das PD kommen soll * @param address Adresse ahnand welcher das PD gesucht werden soll - * @param create TRUE wenn die Strukturen erstellt werden sollen, FALSE wenn + * @param create true wenn die Strukturen erstellt werden sollen, false wenn * nicht. * @param user Wenn Stukturen erstellt werden, kann hiermit bestimmt werden, ob * fuer den Usermode bestimmt sein sollen. @@ -290,7 +290,7 @@ static mmc_pd_entry_t* pd_get_from_context(mmc_context_t context, * * @param context Kontext aus dem die Page table kommen soll * @param address Adresse ahnand welcher die Page table gesucht werden soll - * @param create TRUE wenn die Strukturen erstellt werden sollen, FALSE wenn + * @param create true wenn die Strukturen erstellt werden sollen, false wenn * nicht. * @param user Wenn Stukturen erstellt werden, kann hiermit bestimmt werden, ob * fuer den Usermode bestimmt sein sollen. @@ -338,36 +338,36 @@ static mmc_pt_entry_t* pt_get_from_context(mmc_context_t context, * @param paddr Physische Speicheradresse * @param flags Flags, die gesetzt werden sollen * - * @return TRUE, wenn die virtuelle Seite erfolgreich gemappt werden konnte, - * FALSE sonst. + * @return true, wenn die virtuelle Seite erfolgreich gemappt werden konnte, + * false sonst. */ static bool map_page (mmc_context_t context, vaddr_t vaddr, paddr_t paddr, int flags) { //kprintf("map 0x%16x => 0x%16x\n", vaddr, paddr); - bool big_page = FALSE; - bool user_page = FALSE; + bool big_page = false; + bool user_page = false; uint64_t internal_flags = flags; if ((flags & PAGE_FLAGS_BIG) != 0) { - big_page = TRUE; + big_page = true; } // Die NULL-Page bleibt aus Sicherheitsgruenden ungemappt if (vaddr == NULL) { panic("Versuchtes Mapping nach virtuell NULL"); - return FALSE; + return false; } // Die Adressen muessen beide auf 4K ausgerichtet sein. if ((((((uintptr_t) vaddr | (uintptr_t) paddr)) % PAGE_SIZE) != 0) && - (big_page == FALSE)) + (big_page == false)) { panic("Adressen sind nicht 4K-aligned (virt = %x, phys = %x)", vaddr, paddr); - return FALSE; + return false; } else if ((((((uintptr_t) vaddr | (uintptr_t) paddr)) % (PAGE_SIZE * 512)) - != 0) && (big_page == TRUE)) + != 0) && (big_page == true)) { panic("Adressen sind nicht 4M-aligned (virt = %x, phys = %x)", vaddr, paddr); @@ -375,16 +375,16 @@ static bool map_page // TODO:Flags pruefen. if ((internal_flags & PAGE_FLAGS_USER) != 0) { - user_page = TRUE; + user_page = true; } // Wenn das Nx-Bit gesetzt ist aber nicht benutzt werden darf, wird es // geloescht. Sonst wird das richtige NX-Bit gesetzt. - if ((mmc_use_no_exec == FALSE) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != + if ((mmc_use_no_exec == false) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != 0)) { internal_flags &= ~PAGE_FLAGS_NO_EXEC; - } else if ((mmc_use_no_exec == TRUE) && ((internal_flags & + } else if ((mmc_use_no_exec == true) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != 0)) { internal_flags &= ~PAGE_FLAGS_NO_EXEC; @@ -392,8 +392,8 @@ static bool map_page } // Ab hier wird zwischen grossen und kleinen Pages unterschieden - if (big_page == TRUE) { - mmc_pd_entry_t* pd = pd_get_from_context(context, vaddr, TRUE, + if (big_page == true) { + mmc_pd_entry_t* pd = pd_get_from_context(context, vaddr, true, user_page); size_t index = PAGE_DIRECTORY_INDEX((uintptr_t) vaddr); @@ -410,14 +410,14 @@ static bool map_page pd_free(pd); } else { // PT anfordern, oder sie ggf. erstellen - mmc_pt_entry_t* pt = pt_get_from_context(context, vaddr, TRUE, + mmc_pt_entry_t* pt = pt_get_from_context(context, vaddr, true, user_page); size_t index = PAGE_TABLE_INDEX((uintptr_t) vaddr); // Wenn sie nicht angefordert werden konnte, ist der eintrag im PD // durch eine Grosse Page belegt. if (pt == NULL) { panic("Doppelbelegung im Page Directory. (0x%lx)", (uintptr_t) vaddr); - return FALSE; + return false; } // Wenn der entsprechende Eintrag in der PT nicht frei ist, wird auch @@ -427,7 +427,7 @@ static bool map_page panic("Doppelbelegung in einer Page Table. (0x%08x%08x => 0x%08x%08x)", ((uintptr_t) vaddr) >> 32, ((uintptr_t) vaddr) & 0xFFFFFFFF, ((uintptr_t) paddr) >> 32, ((uintptr_t) paddr) & 0xFFFFFFFF); - return FALSE; + return false; } // Wenn alles gut gelaufen ist, wirds jetzt ernst @@ -436,7 +436,7 @@ static bool map_page pt_free(pt); } - return TRUE; + return true; } /** @@ -453,8 +453,8 @@ static bool map_page * @param flags Flags * @param num Anzahl der Seiten * - * @return TRUE, wenn der bereich erfolgreich gemappt werden konnte, - * FALSE sonst + * @return true, wenn der bereich erfolgreich gemappt werden konnte, + * false sonst */ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, int flags, size_t num_pages) @@ -475,14 +475,14 @@ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, va = (vaddr_t)((uintptr_t)vaddr + i * PAGE_SIZE * page_count); pa = (paddr_t)((uintptr_t)paddr + i * PAGE_SIZE * page_count); - if(map_page(context, va, pa, flags) != TRUE) + if(map_page(context, va, pa, flags) != true) { /* TODO: Das bereits geschehene Mapping rückgängig machen */ - return FALSE; + return false; } } - return TRUE; + return true; } /** @@ -492,8 +492,8 @@ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, * Adresse bezieht * @param vaddr Virtuelle Speicheradresse * - * @return TRUE, wenn die virtuelle Seite erfolgreich ungemappt werden konnte, - * FALSE sonst + * @return true, wenn die virtuelle Seite erfolgreich ungemappt werden konnte, + * false sonst */ bool mmc_unmap(mmc_context_t context, vaddr_t vaddr, size_t count) { @@ -502,11 +502,11 @@ bool mmc_unmap(mmc_context_t context, vaddr_t vaddr, size_t count) /*for (i = 0; i < count; i++) { if (!unmap_page(page_directory, vaddr + i * PAGE_SIZE)) { - return FALSE; + return false; } }*/ - return TRUE; + return true; } diff --git a/src/kernel2/src/arch/amd64/mm/mm_virt.c b/src/kernel2/src/arch/amd64/mm/mm_virt.c index 544b8cb..2b2e9c3 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_virt.c +++ b/src/kernel2/src/arch/amd64/mm/mm_virt.c @@ -63,9 +63,9 @@ void vmm_init(mmc_context_t context) // Wenn das entsprechende Bit gesetzt ist, duerfen wir es gefahrlos // benutzen. if ((features & (1 << 20)) != 0) { - mmc_use_no_exec = TRUE; + mmc_use_no_exec = true; } else { - mmc_use_no_exec = FALSE; + mmc_use_no_exec = false; } // Den Kernel mappen @@ -100,7 +100,7 @@ void vmm_init(mmc_context_t context) void vmm_init_local(mmc_context_t context) { // NXE aktivieren. - if (mmc_use_no_exec == TRUE) { + if (mmc_use_no_exec == true) { cpu_write_msr(0xC0000080, cpu_read_msr(0xC0000080) | (1 << 11)); } -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:03 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:03 +0100 Subject: [tyndur-devel] =?utf-8?b?W1BBVENIIDAzLzExXSBsaWJjOiBwYWdlLmggZsO8?= =?utf-8?q?r_arch/amd64?= In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-3-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- src/include/arch/amd64/page.h | 69 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) create mode 100644 src/include/arch/amd64/page.h diff --git a/src/include/arch/amd64/page.h b/src/include/arch/amd64/page.h new file mode 100644 index 0000000..1d4cb66 --- /dev/null +++ b/src/include/arch/amd64/page.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2006-2011 The tyndur Project. All rights reserved. + * + * This code is derived from software contributed to the tyndur Project + * by Burkhard Weseloh. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _PAGE_H_ +#define _PAGE_H_ + +#define PAGE_SHIFT 12 +#define PAGE_SIZE 0x1000 +// AMD64 beschränkt den Physikalischen Adressraum auf 52 Bit +#define PAGE_MASK 0x000ffffffffff000L + +#define PAGE_MAP_LENGTH 512 +#define PAGE_MAP_SHIFT 39 +#define PAGE_MAP_INDEX(addr) ((uintptr_t)(addr) >> PAGE_MAP_SHIFT) + +#define PAGE_DIR_PTR_TABLE_LENGTH 512 +#define PAGE_DIR_PTR_TABLE_SHIFT 30 +#define PAGE_DIR_PTR_TABLE_INDEX(addr) \ + (((uintptr_t)(addr) >> PAGE_DIR_PTR_TABLE_SHIFT) & (PAGE_DIR_PTR_TABLE_LENGTH - 1)) + +#define PAGE_DIRECTORY_LENGTH 512 +#define PAGE_DIRECTORY_SHIFT 21 +#define PAGE_DIRECTORY_INDEX(addr) ( \ + ((uintptr_t)(addr) >> PAGE_DIRECTORY_SHIFT) & \ + (PAGE_DIRECTORY_LENGTH - 1)) + +#define PAGE_TABLE_LENGTH 512 +#define PAGE_TABLE_SHIFT 12 +#define PAGE_TABLE_INDEX(addr) (((uintptr_t)(addr) >> PAGE_TABLE_SHIFT) & \ + (PAGE_TABLE_LENGTH - 1)) + +// Rundet eine Adresse auf das kleinste Vielfache von PAGE_SIZE > n auf +#define PAGE_ALIGN_ROUND_UP(n) (((n) + ~PAGE_MASK) & PAGE_MASK) + +// Rundet eine Adresse auf das größte Vielfache von PAGE_SIZE < n ab +#define PAGE_ALIGN_ROUND_DOWN(n) ((n) & PAGE_MASK) + +// Die Anzahl der Pages, die von n Bytes belegt werden. +#define NUM_PAGES(n) (PAGE_ALIGN_ROUND_UP(n) >> PAGE_SHIFT) + +// Die Anzahl der Page Maps die für n Bytes benötigt werden. +#define NUM_PAGE_MAPS(n) (((n) + (1L << PAGE_MAP_SHIFT) - 1) >> PAGE_MAP_SHIFT) + +#endif -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:04 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:04 +0100 Subject: [tyndur-devel] [PATCH 04/11] kernel2: mm_arch.h angepasst In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-4-git-send-email-m.nemo@gmx.net> Signed-off-by: Andreas Freimuth --- src/kernel2/include/arch/amd64/mm_arch.h | 72 +++++++++-------------------- 1 files changed, 23 insertions(+), 49 deletions(-) diff --git a/src/kernel2/include/arch/amd64/mm_arch.h b/src/kernel2/include/arch/amd64/mm_arch.h index d94ad56..a7794d3 100644 --- a/src/kernel2/include/arch/amd64/mm_arch.h +++ b/src/kernel2/include/arch/amd64/mm_arch.h @@ -36,57 +36,44 @@ #ifndef _MM_ARCH_H_ #define _MM_ARCH_H_ -#include #include +#include +#include +#include #include "multiboot.h" -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1 << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE - 1)) - -#define PAGE_MAP_LENGTH 512 -#define PAGE_MAP_SHIFT 39 -#define PAGE_MAP_INDEX(addr) ((uintptr_t)addr >> PAGE_MAP_SHIFT) - -#define PAGE_DIR_PTR_TABLE_LENGTH 512 -#define PAGE_DIR_PTR_TABLE_SHIFT 30 -#define PAGE_DIR_PTR_TABLE_INDEX(addr) (((uintptr_t)addr >> \ - PAGE_DIR_PTR_TABLE_SHIFT) & (PAGE_DIR_PTR_TABLE_LENGTH - 1)) - -#define PAGE_DIRECTORY_LENGTH 512 -#define PAGE_DIRECTORY_SHIFT 21 -#define PAGE_DIRECTORY_INDEX(addr) (((uintptr_t)addr >> PAGE_DIRECTORY_SHIFT) & \ - (PAGE_DIRECTORY_LENGTH - 1)) - -#define PAGE_TABLE_LENGTH 512 -#define PAGE_TABLE_SHIFT 12 -#define PAGE_TABLE_INDEX(addr) (((uintptr_t)addr >> PAGE_TABLE_SHIFT) & \ - (PAGE_TABLE_LENGTH - 1)) - - // Die Adresse, an der der Kernel-Adressraum beginnt #define KERNEL_MEM_START 0x00000000 #define KERNEL_MEM_END 0x40000000 // Die Adresse, an der der Userspace-Adressraum beginnt #define USER_MEM_START (0x1L << PAGE_MAP_SHIFT) -#define USER_MEM_END ((0x100L << PAGE_MAP_SHIFT) - 1) - +#define USER_MEM_END (0x100L << PAGE_MAP_SHIFT) + +// TODO: Redundanz oder semantischer Unterschied +#define MM_USER_START USER_MEM_START +#define MM_USER_END USER_MEM_END + #define USER_STACK_START USER_MEM_END #define USER_STACK_SIZE 0x1000 -// Der gesamte Physikalische Speicher wird 1:1 an diese Adresse gemapt #define ADDRESS_SIGN_EXTEND (0xFFFFL << 48) + +// Der gesamte Physikalische Speicher wird 1:1 an diese Adresse gemapt #define MAPPED_PHYS_MEM_START ((0x1FFL << PAGE_MAP_SHIFT) | ADDRESS_SIGN_EXTEND) #define MAPPED_PHYS_MEM_GET(addr) ((vaddr_t) ((uintptr_t)MAPPED_PHYS_MEM_START \ - | (uintptr_t)addr)) - -typedef qword mmc_pm_entry_t; -typedef qword mmc_pdpt_entry_t; -typedef qword mmc_pd_entry_t; -typedef qword mmc_pt_entry_t; -typedef mmc_pm_entry_t* mmc_context_t; + | (uintptr_t)(addr))) + +typedef uint64_t mmc_pm_entry_t; +typedef uint64_t mmc_pdpt_entry_t; +typedef uint64_t mmc_pd_entry_t; +typedef uint64_t mmc_pt_entry_t; +typedef struct { + uint_least16_t version; + lock_t lock; + paddr_t pml4; +} mmc_context_t; #define PAGE_FLAGS_PRESENT (1 << 0) #define PAGE_FLAGS_WRITABLE (1 << 1) @@ -98,24 +85,11 @@ typedef mmc_pm_entry_t* mmc_context_t; #define PAGE_FLAGS_INTERNAL_NX (1L << 63) -// FIXME: Der Code sollte nicht beschreibbar sein. -#define MM_FLAGS_KERNEL_CODE (PAGE_FLAGS_PRESENT | PAGE_FLAGS_GLOBAL | \ - PAGE_FLAGS_WRITABLE) +#define MM_FLAGS_KERNEL_CODE (PAGE_FLAGS_PRESENT | PAGE_FLAGS_GLOBAL) #define MM_FLAGS_KERNEL_DATA (PAGE_FLAGS_PRESENT | PAGE_FLAGS_WRITABLE | \ PAGE_FLAGS_GLOBAL | PAGE_FLAGS_NO_EXEC) #define MM_FLAGS_USER_CODE (PAGE_FLAGS_PRESENT | PAGE_FLAGS_USER) #define MM_FLAGS_USER_DATA (PAGE_FLAGS_PRESENT | PAGE_FLAGS_USER | \ PAGE_FLAGS_WRITABLE | PAGE_FLAGS_NO_EXEC) -// Die Anzahl der Pages, die von n Bytes belegt werden. -#define NUM_PAGES(n) ((((n) + ~PAGE_MASK) & PAGE_MASK) / PAGE_SIZE) - -// Rundet eine Adresse auf das kleinste Vielfache von PAGE_SIZE > n auf -#define PAGE_ALIGN_ROUND_UP(n) (((n) + ~PAGE_MASK) & PAGE_MASK) - -// Rundet eine Adresse auf das groesste Vielfache von PAGE_SIZE < n ab -#define PAGE_ALIGN_ROUND_DOWN(n) ((n) & PAGE_MASK) - - - #endif -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:05 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:05 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_05/11=5D_kernel2=3A_Erstellen_v?= =?utf-8?q?on_mm-Kontexten?= In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-5-git-send-email-m.nemo@gmx.net> * mmc_create: einfach nur die Page Map als Kontext reicht nicht aus Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/mm/mm_context.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index fed401d..7d4670b 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -51,25 +51,26 @@ /// Bestimmt ob das NX-Bit benutzt werden soll. bool mmc_use_no_exec = false; - /** - * Erstellt einen neuen MM-Kontext (Page Directory) für den Kernel. - * Diese Funktion wird nur zur Initialisierung benutzt, solange Paging - * noch nicht aktiviert ist. + * Erstellt einen neuen MM-Kontext (PM) für einen Prozess * - * @return Pointer auf die physikalische Adresse des Kontexts + * @return neuer MM-Kontext */ mmc_context_t mmc_create() { - // Die Pagemap initialisieren - paddr_t phys_page_map = pmm_alloc(1); - mmc_context_t page_map = - vmm_kernel_automap(phys_page_map, PAGE_SIZE); + mmc_context_t context; + + context.version = 0; + context.lock = LOCK_UNLOCKED; + + // Die Page Map Level 4 initialisieren + context.pml4 = pmm_alloc(1); + memset(MAPPED_PHYS_MEM_GET(context.pml4), 0, PAGE_SIZE); - memset(page_map, 0, PAGE_SIZE); - vmm_kernel_unmap(page_map, PAGE_SIZE); + // Kernel-Bereich mappen + mmc_sync(&context); - return phys_page_map; + return context; } /** @@ -509,4 +510,3 @@ bool mmc_unmap(mmc_context_t context, vaddr_t vaddr, size_t count) return true; } - -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:06 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:06 +0100 Subject: [tyndur-devel] [PATCH 06/11] kernel2: Synchronisieren von mm-Kontexten mit dem Kernel-Kontext In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-6-git-send-email-m.nemo@gmx.net> + mmc_sync: Wird unter amd64 tendenziell eher selten gebraucht, da der Kernel-Speicher sich kaum über 512GiB bewegen wird. Diese Möglichkeit wollen wir dem Kernel aber dennoch nicht nehmen. Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/mm/mm_context.c | 37 ++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index 7d4670b..5438e78 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -51,6 +51,43 @@ /// Bestimmt ob das NX-Bit benutzt werden soll. bool mmc_use_no_exec = false; +mmc_context_t kernel_ctx = { + .version = 0, + .lock = LOCK_UNLOCKED +}; + +/** + * Synchronisiere einen MM-Kontext mit dem Kernel-Kontext + * + * @param ctx MM-Kontext + */ +void mmc_sync(mmc_context_t* ctx) +{ + // TODO ctx und kernel_ctx locken (Philosophenproblem) + if(ctx->version < kernel_ctx.version) { + + mmc_pm_entry_t* user_pm = MAPPED_PHYS_MEM_GET(ctx->pml4); + mmc_pm_entry_t* kernel_pm = MAPPED_PHYS_MEM_GET(kernel_ctx.pml4); + + // Kopiere die vom Kernel belegten Page Maps + unsigned int kernelStartIndex = PAGE_MAP_INDEX(KERNEL_MEM_START); + + memcpy(&user_pm[kernelStartIndex], &kernel_pm[kernelStartIndex], + sizeof(mmc_pm_entry_t) * + NUM_PAGE_MAPS(KERNEL_MEM_END - KERNEL_MEM_START)); + + + // Kopiere Identity Map + unsigned int idMapStartIndex = + PAGE_MAP_INDEX(MAPPED_PHYS_MEM_START & ~ADDRESS_SIGN_EXTEND); + + memcpy(&user_pm[idMapStartIndex], &kernel_pm[idMapStartIndex], + sizeof(mmc_pm_entry_t) * + NUM_PAGE_MAPS(-1L - MAPPED_PHYS_MEM_START)); + ctx->version = kernel_ctx.version; + } +} + /** * Erstellt einen neuen MM-Kontext (PM) für einen Prozess * -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:07 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:07 +0100 Subject: [tyndur-devel] [PATCH 07/11] kernel2: Kernel-Kontext erstellen In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-7-git-send-email-m.nemo@gmx.net> ! mmc_create_kernel_kontext: Da Paging ja schon läuft einfach die Aktuelle Page-Map nehmen und daraus einen mm-Kontext erstellen Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/mm/mm_context.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index 5438e78..d21b1db 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -111,15 +111,20 @@ mmc_context_t mmc_create() } /** - * Erstellt einen neuen MM-Kontext (PM) für den Kernel. + * Erstellt einen neuen MM-Kontext für den Kernel. * Diese Funktion wird nur zur Initialisierung benutzt, solange kein richtiges - * Paging laeuft. Dies spielt aber bei AMD64 keine Rolle, weil Pagin aktiv sein - * muss, deshalb wird einfach die normale mmc_create benutzt. + * Paging läuft. Dies spielt aber bei AMD64 keine Rolle, weil Paging aktiv sein + * muss, deshalb wird einfach die aktuelle Page Map eingetragen. */ mmc_context_t mmc_create_kernel_context() { - mmc_context_t context = mmc_create(); - return context; + kernel_ctx.version = 1; + kernel_ctx.lock = LOCK_UNLOCKED; + + // Die Aktuelle Page Map in den Kernel MM-Kontext übernehmen + asm volatile ("mov %%cr3, %0" : "=a"(kernel_ctx.pml4)); + + return kernel_ctx; } /** -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:08 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:08 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_08/11=5D_kernel2=3A_zerst=C3=B6?= =?utf-8?q?ren_von_mm-Kontexten_implementiert?= In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-8-git-send-email-m.nemo@gmx.net> + mmc_destroy tut jetzt auch was es soll Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/mm/mm_context.c | 89 +++++++++++++++++++++++++++- 1 files changed, 86 insertions(+), 3 deletions(-) diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index d21b1db..82115af 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -128,11 +128,94 @@ mmc_context_t mmc_create_kernel_context() } /** - * Einen MM-Kontext zerstoeren und den gemappten Userspace-Speicher freigeben + * Eine Page-Table und alle untergeordneten Pages freigeben. + * + * @param pd_entry Page-Directory-Eintrag für die frei zu gebende + * Page-Table + */ +static void free_pt(mmc_pd_entry_t pd_entry) +{ + if(pd_entry & PAGE_FLAGS_BIG) { + // 2MiB freigeben + pmm_free(pd_entry & ~((1L << PAGE_DIRECTORY_SHIFT) - 1), + PAGE_TABLE_LENGTH); + } else { + mmc_pt_entry_t* pt = MAPPED_PHYS_MEM_GET(pd_entry & PAGE_MASK); + + unsigned int i; + for(i = 0; i < PAGE_TABLE_LENGTH; i++) { + if(pt[i] != 0) + pmm_free(pt[i] & PAGE_MASK, 1); + } + + pmm_free(pd_entry & PAGE_MASK, 1); + } +} + +/** + * Ein Page-Directory und alle untergeordneten Strukturen freigeben. + * + * @param pdpt_entry Page-Directory-Pointer-Table-Eintrag für das frei zu + * gebende Page-Directory + */ +static void free_pd(mmc_pdpt_entry_t pdpt_entry) +{ + if(pdpt_entry & PAGE_FLAGS_BIG) { + // 1GiB freigeben + pmm_free(pdpt_entry & ~((1L << PAGE_DIR_PTR_TABLE_SHIFT) - 1), + PAGE_DIRECTORY_LENGTH * PAGE_TABLE_LENGTH); + } else { + mmc_pd_entry_t* pd = MAPPED_PHYS_MEM_GET(pdpt_entry & PAGE_MASK); + + unsigned int i; + for(i = 0; i < PAGE_DIRECTORY_LENGTH; i++) { + if(pd[i] != 0) + free_pt(pd[i]); + } + + pmm_free(pdpt_entry & PAGE_MASK, 1); + } +} + +/** + * Eine Page-Directory-Pointer-Table und alle untergeordneten Strukturen + * freigeben. + * + * @param pm_entry Page-Map-Eintrag für die frei zu gebende + * Page-Directory-Pointer-Table + */ +static void free_pdpt(mmc_pm_entry_t pm_entry) +{ + mmc_pdpt_entry_t* pdpt = MAPPED_PHYS_MEM_GET(pm_entry & PAGE_MASK); + + unsigned int i; + for(i = 0; i < PAGE_DIR_PTR_TABLE_LENGTH; i++) { + if(pdpt[i] != 0) + free_pd(pdpt[i]); + } + + pmm_free(pm_entry & PAGE_MASK, 1); +} + +/** + * Einen MM-Kontext zerstören und den gemappten Userspace-Speicher freigeben. + * + * @param context zu zerstörender MM-Kontext */ -void mmc_destroy(mmc_context_t context) +void mmc_destroy(mmc_context_t* context) { - // TODO + mmc_pm_entry_t* pml4 = MAPPED_PHYS_MEM_GET(context->pml4); + + pml4 += PAGE_MAP_INDEX(USER_MEM_START); + unsigned int i; + for(i = 0; i < NUM_PAGE_MAPS(USER_MEM_END - USER_MEM_START); + i++) + { + if(pml4[i] != 0) + free_pdpt(pml4[i]); + } + + pmm_free(context->pml4, 1); } /** -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:09 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:09 +0100 Subject: [tyndur-devel] [PATCH 09/11] kernel2: jede CPU hat einen aktuellen mm-Kontext In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-9-git-send-email-m.nemo@gmx.net> + cpu_t: einen mm_context Eintrag hinzu gefügt Signed-off-by: Andreas Freimuth --- src/kernel2/include/arch/amd64/cpu.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/kernel2/include/arch/amd64/cpu.h b/src/kernel2/include/arch/amd64/cpu.h index 7444842..b5dc0c6 100644 --- a/src/kernel2/include/arch/amd64/cpu.h +++ b/src/kernel2/include/arch/amd64/cpu.h @@ -88,6 +88,7 @@ typedef struct { uint8_t apic_id; bool bootstrap; cpu_tss_t tss; + mmc_context_t* mm_context; } cpu_t; extern cpu_t cpus[]; -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:10 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:10 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_10/11=5D_kernel2=3A_mm-Kontext_?= =?utf-8?q?aktivieren?= In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-10-git-send-email-m.nemo@gmx.net> + mmc_activate: aktiviert einen mm-Kontext Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/cpu.c | 22 ---------------------- src/kernel2/src/arch/amd64/mm/mm_context.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/kernel2/src/arch/amd64/cpu.c b/src/kernel2/src/arch/amd64/cpu.c index fe1e2b8..b618272 100644 --- a/src/kernel2/src/arch/amd64/cpu.c +++ b/src/kernel2/src/arch/amd64/cpu.c @@ -183,25 +183,3 @@ void cpu_dump(machine_state_t* machine_state) kprintf("CR4=0x%016x CR8=0x%016x EFR=0x%016x\n", cr[4], cr[1], cpu_read_msr(0xC0000080)); } - -/** - * Pointer auf den aktuellen Kontext von der CPU auslesen - * - * @return Kontext - */ -mmc_context_t cpu_get_context() -{ - uintptr_t context; - asm("movq %%cr3, %0" : "=A" (context)); - return (mmc_context_t) (context & (~0xFFF)); -} - -/** - * - * @param context Neuer Kontext - */ -void cpu_set_context(mmc_context_t context) -{ - asm("movq %0, %%cr3" : : "A" (context)); -} - diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index 82115af..adc105c 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -219,6 +219,19 @@ void mmc_destroy(mmc_context_t* context) } /** + * Den Kontext aktivieren indem die Adresse der zugehörigen Page Map in + * cr3 geladen wird. + * + * @param context Kontext + */ +void mmc_activate(mmc_context_t* context) +{ + mmc_sync(context); + cpu_get_current()->mm_context = context; + asm("mov %0, %%cr3" : : "r" (context->pml4)); +} + +/** * Pointer auf die Pagemap eines Kontexts holen. Der Pointer ist eine virtuelle * Adresse und darf direkt benutzt werden. Wenn er nicht mehr gebraucht wird, * muss er per pm_free freigegeben werden. -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:18:11 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:18:11 +0100 Subject: [tyndur-devel] [PATCH 11/11] kernel2: cpu_t braucht einen thread Eintrag In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295115491-31710-11-git-send-email-m.nemo@gmx.net> + cpu_t: einen thread Eintrag für den jeweils aktuellen Thread Signed-off-by: Andreas Freimuth --- src/kernel2/include/arch/amd64/cpu.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/kernel2/include/arch/amd64/cpu.h b/src/kernel2/include/arch/amd64/cpu.h index b5dc0c6..0826c32 100644 --- a/src/kernel2/include/arch/amd64/cpu.h +++ b/src/kernel2/include/arch/amd64/cpu.h @@ -88,6 +88,7 @@ typedef struct { uint8_t apic_id; bool bootstrap; cpu_tss_t tss; + pm_thread_t* thread; mmc_context_t* mm_context; } cpu_t; -- 1.7.3.4 From m.nemo at gmx.net Sat Jan 15 19:22:46 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:22:46 +0100 Subject: [tyndur-devel] [PATCH 02/11] kernel2: TRUE/FALSE durch true/false ersetzen In-Reply-To: <1295115491-31710-2-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> <1295115491-31710-2-git-send-email-m.nemo@gmx.net> Message-ID: <4D31E5F6.8050605@gmx.net> Och ne!! Diese doofen DOS-Line-endings. Ich schicke das gleich nochmal. From m.nemo at gmx.net Sat Jan 15 19:35:06 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sat, 15 Jan 2011 19:35:06 +0100 Subject: [tyndur-devel] [PATCH 02/11] kernel2: TRUE/FALSE durch true/false ersetzen In-Reply-To: <1295115491-31710-2-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-2-git-send-email-m.nemo@gmx.net> Message-ID: <1295116506-469-1-git-send-email-m.nemo@gmx.net> ! bool: Standard C Bezeichner für Boolean-Werte Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/im/im.c | 126 ++++++++++++++-------------- src/kernel2/src/arch/amd64/mm/mm_context.c | 68 ++++++++-------- src/kernel2/src/arch/amd64/mm/mm_virt.c | 6 +- 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/kernel2/src/arch/amd64/im/im.c b/src/kernel2/src/arch/amd64/im/im.c index 2056524..a20bab1 100644 --- a/src/kernel2/src/arch/amd64/im/im.c +++ b/src/kernel2/src/arch/amd64/im/im.c @@ -44,43 +44,43 @@ #define IDT_GATE_COUNT 256 #define IDT_GATE_TYPE_INT 0xE #define IDT_GATE_TYPE_TRAP 0xF - -typedef struct { - /// Die untersten 16 Bits der Handler-Adresse - uint16_t offset_low; - /// Code-Segment-Selektor - uint16_t segment; - - /// ID des Stack-Table-Eintrages - uint8_t interrupt_stack_table : 3; - /// Reserviert - uint8_t : 5; - /// Typ des Gates - uint8_t type : 4; - /// Reserviert - uint8_t : 1; - /// Noetiges Privileg-Level um den Handler aufrufen zu duerfen - uint8_t privilege_level : 2; - /// Bestimmt, ob das Gate praesent - bool present : 1; - - /// Die naechsten paar Bits der Adresse - uint16_t offset_mid; - uint32_t offset_high; - - /// Reserviert - uint32_t : 32; - -} __attribute__((packed)) idt_gate_t; - + +typedef struct { + /// Die untersten 16 Bits der Handler-Adresse + uint16_t offset_low; + /// Code-Segment-Selektor + uint16_t segment; + + /// ID des Stack-Table-Eintrages + uint8_t interrupt_stack_table : 3; + /// Reserviert + uint8_t : 5; + /// Typ des Gates + uint8_t type : 4; + /// Reserviert + uint8_t : 1; + /// Noetiges Privileg-Level um den Handler aufrufen zu duerfen + uint8_t privilege_level : 2; + /// Bestimmt, ob das Gate praesent + bool present : 1; + + /// Die naechsten paar Bits der Adresse + uint16_t offset_mid; + uint32_t offset_high; + + /// Reserviert + uint32_t : 32; + +} __attribute__((packed)) idt_gate_t; + // Die ganze IDT (Achtung wird auch aus dem SMP-Trampoline-Code geladen!) -idt_gate_t idt[IDT_GATE_COUNT]; -bool use_apic; - -static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_level); - -// Die ASM-Stubs -extern void im_int_stub_0(); +idt_gate_t idt[IDT_GATE_COUNT]; +bool use_apic; + +static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_level); + +// Die ASM-Stubs +extern void im_int_stub_0(); extern void im_int_stub_1(); extern void im_int_stub_2(); extern void im_int_stub_3(); @@ -599,24 +599,24 @@ void im_init() idt_set_gate(254, &im_int_stub_254, 0); idt_set_gate(255, &im_int_stub_255, 0); - use_apic = TRUE; + use_apic = true; } /** * Die IDT laden und Interrupts aktivieren. */ void im_enable() -{ - // Register zum laden der IDT vorbereiten - struct { - uint16_t size; - uint64_t base; - } __attribute__((packed)) idt_ptr = { - .size = IDT_GATE_COUNT * sizeof(idt_gate_t) - 1, - .base = (uint64_t)idt, - }; - - asm("lidt %0" : : "m" (idt_ptr)); +{ + // Register zum laden der IDT vorbereiten + struct { + uint16_t size; + uint64_t base; + } __attribute__((packed)) idt_ptr = { + .size = IDT_GATE_COUNT * sizeof(idt_gate_t) - 1, + .base = (uint64_t)idt, + }; + + asm("lidt %0" : : "m" (idt_ptr)); } /** @@ -624,13 +624,13 @@ void im_enable() * * @param interrupt Interrupt-Nummer * @param handler Pointer auf die Handerfunktion. - * @param privilege_level Bestimmt ob der Interrup fuer den Kernel- (0) oder - * fuer den User-Ring (3) bestimmt ist. - */ -static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_level) -{ - // Handler-Adresse - uintptr_t uint_handler = (uintptr_t) handler; + * @param privilege_level Bestimmt ob der Interrup fuer den Kernel- (0) oder + * fuer den User-Ring (3) bestimmt ist. + */ +static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_level) +{ + // Handler-Adresse + uintptr_t uint_handler = (uintptr_t) handler; idt[interrupt].offset_low = uint_handler & 0xFFFF; idt[interrupt].offset_mid = (uint_handler >> 16) & 0xFFFF; idt[interrupt].offset_high = uint_handler >> 32; @@ -638,19 +638,19 @@ static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_le // TODO: Segment gehoert hier nicht hartkodiert hin idt[interrupt].segment = 0x8; idt[interrupt].type = IDT_GATE_TYPE_TRAP; - idt[interrupt].present = TRUE; + idt[interrupt].present = true; idt[interrupt].privilege_level = privilege_level; } /** * Muss vom plattformunabhaengigen Handler aufgerufen werden. - * - * @param interrupt Interruptnummer - */ -void im_end_of_interrupt(uint8_t interrupt) -{ - // Nur mit dem traditionellen PIC - if (use_apic == FALSE) { + * + * @param interrupt Interruptnummer + */ +void im_end_of_interrupt(uint8_t interrupt) +{ + // Nur mit dem traditionellen PIC + if (use_apic == false) { if ((interrupt >= IM_IRQ_BASE) && (interrupt <= IM_IRQ_BASE + 16)) { pic_eoi(interrupt - IM_IRQ_BASE); } diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index b6d5274..fed401d 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -49,7 +49,7 @@ */ /// Bestimmt ob das NX-Bit benutzt werden soll. -bool mmc_use_no_exec = FALSE; +bool mmc_use_no_exec = false; /** @@ -122,7 +122,7 @@ static void pm_free(mmc_pm_entry_t* pm) * * @param pm Pointer auf die Pagemap. Dieser muss gemappt sein. Am besten mit * pm_get. - * @param create Wenn TRUE, werden nicht existierende PDPTs erstellt und + * @param create Wenn true, werden nicht existierende PDPTs erstellt und * gemappt. * @param user Wenn die pdpt erstellt werden muss, bestimmt dieser Parameter ob * die pdpt fuer den Usermode bestimmt ist, oder nicht. @@ -138,7 +138,7 @@ static mmc_pdpt_entry_t* pdpt_get(mmc_pm_entry_t* pm, return vmm_kernel_automap((paddr_t) (pm[index] & PAGE_MASK), PAGE_SIZE); } else { - if (create == TRUE) { + if (create == true) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pdpt_entry_t* pdpt = vmm_kernel_automap(phys, PAGE_SIZE); @@ -176,7 +176,7 @@ static mmc_pd_entry_t* pd_get(mmc_pdpt_entry_t* pdpt, size_t index, return vmm_kernel_automap((paddr_t) (pdpt[index] & PAGE_MASK), PAGE_SIZE); } else { - if (create == TRUE) { + if (create == true) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pd_entry_t* pd = vmm_kernel_automap(phys, PAGE_SIZE); @@ -216,7 +216,7 @@ static mmc_pt_entry_t* pt_get(mmc_pd_entry_t* pd, size_t index, bool create, return vmm_kernel_automap((paddr_t) (pd[index] & PAGE_MASK), PAGE_SIZE); } else { - if ((create == TRUE) && ((pd[index] & 1) == 0)) { + if ((create == true) && ((pd[index] & 1) == 0)) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pt_entry_t* pt = vmm_kernel_automap(phys, PAGE_SIZE); @@ -251,7 +251,7 @@ static void pt_free(mmc_pt_entry_t* pt) * * @param context Kontext aus dem das PD kommen soll * @param address Adresse ahnand welcher das PD gesucht werden soll - * @param create TRUE wenn die Strukturen erstellt werden sollen, FALSE wenn + * @param create true wenn die Strukturen erstellt werden sollen, false wenn * nicht. * @param user Wenn Stukturen erstellt werden, kann hiermit bestimmt werden, ob * fuer den Usermode bestimmt sein sollen. @@ -290,7 +290,7 @@ static mmc_pd_entry_t* pd_get_from_context(mmc_context_t context, * * @param context Kontext aus dem die Page table kommen soll * @param address Adresse ahnand welcher die Page table gesucht werden soll - * @param create TRUE wenn die Strukturen erstellt werden sollen, FALSE wenn + * @param create true wenn die Strukturen erstellt werden sollen, false wenn * nicht. * @param user Wenn Stukturen erstellt werden, kann hiermit bestimmt werden, ob * fuer den Usermode bestimmt sein sollen. @@ -338,36 +338,36 @@ static mmc_pt_entry_t* pt_get_from_context(mmc_context_t context, * @param paddr Physische Speicheradresse * @param flags Flags, die gesetzt werden sollen * - * @return TRUE, wenn die virtuelle Seite erfolgreich gemappt werden konnte, - * FALSE sonst. + * @return true, wenn die virtuelle Seite erfolgreich gemappt werden konnte, + * false sonst. */ static bool map_page (mmc_context_t context, vaddr_t vaddr, paddr_t paddr, int flags) { //kprintf("map 0x%16x => 0x%16x\n", vaddr, paddr); - bool big_page = FALSE; - bool user_page = FALSE; + bool big_page = false; + bool user_page = false; uint64_t internal_flags = flags; if ((flags & PAGE_FLAGS_BIG) != 0) { - big_page = TRUE; + big_page = true; } // Die NULL-Page bleibt aus Sicherheitsgruenden ungemappt if (vaddr == NULL) { panic("Versuchtes Mapping nach virtuell NULL"); - return FALSE; + return false; } // Die Adressen muessen beide auf 4K ausgerichtet sein. if ((((((uintptr_t) vaddr | (uintptr_t) paddr)) % PAGE_SIZE) != 0) && - (big_page == FALSE)) + (big_page == false)) { panic("Adressen sind nicht 4K-aligned (virt = %x, phys = %x)", vaddr, paddr); - return FALSE; + return false; } else if ((((((uintptr_t) vaddr | (uintptr_t) paddr)) % (PAGE_SIZE * 512)) - != 0) && (big_page == TRUE)) + != 0) && (big_page == true)) { panic("Adressen sind nicht 4M-aligned (virt = %x, phys = %x)", vaddr, paddr); @@ -375,16 +375,16 @@ static bool map_page // TODO:Flags pruefen. if ((internal_flags & PAGE_FLAGS_USER) != 0) { - user_page = TRUE; + user_page = true; } // Wenn das Nx-Bit gesetzt ist aber nicht benutzt werden darf, wird es // geloescht. Sonst wird das richtige NX-Bit gesetzt. - if ((mmc_use_no_exec == FALSE) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != + if ((mmc_use_no_exec == false) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != 0)) { internal_flags &= ~PAGE_FLAGS_NO_EXEC; - } else if ((mmc_use_no_exec == TRUE) && ((internal_flags & + } else if ((mmc_use_no_exec == true) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != 0)) { internal_flags &= ~PAGE_FLAGS_NO_EXEC; @@ -392,8 +392,8 @@ static bool map_page } // Ab hier wird zwischen grossen und kleinen Pages unterschieden - if (big_page == TRUE) { - mmc_pd_entry_t* pd = pd_get_from_context(context, vaddr, TRUE, + if (big_page == true) { + mmc_pd_entry_t* pd = pd_get_from_context(context, vaddr, true, user_page); size_t index = PAGE_DIRECTORY_INDEX((uintptr_t) vaddr); @@ -410,14 +410,14 @@ static bool map_page pd_free(pd); } else { // PT anfordern, oder sie ggf. erstellen - mmc_pt_entry_t* pt = pt_get_from_context(context, vaddr, TRUE, + mmc_pt_entry_t* pt = pt_get_from_context(context, vaddr, true, user_page); size_t index = PAGE_TABLE_INDEX((uintptr_t) vaddr); // Wenn sie nicht angefordert werden konnte, ist der eintrag im PD // durch eine Grosse Page belegt. if (pt == NULL) { panic("Doppelbelegung im Page Directory. (0x%lx)", (uintptr_t) vaddr); - return FALSE; + return false; } // Wenn der entsprechende Eintrag in der PT nicht frei ist, wird auch @@ -427,7 +427,7 @@ static bool map_page panic("Doppelbelegung in einer Page Table. (0x%08x%08x => 0x%08x%08x)", ((uintptr_t) vaddr) >> 32, ((uintptr_t) vaddr) & 0xFFFFFFFF, ((uintptr_t) paddr) >> 32, ((uintptr_t) paddr) & 0xFFFFFFFF); - return FALSE; + return false; } // Wenn alles gut gelaufen ist, wirds jetzt ernst @@ -436,7 +436,7 @@ static bool map_page pt_free(pt); } - return TRUE; + return true; } /** @@ -453,8 +453,8 @@ static bool map_page * @param flags Flags * @param num Anzahl der Seiten * - * @return TRUE, wenn der bereich erfolgreich gemappt werden konnte, - * FALSE sonst + * @return true, wenn der bereich erfolgreich gemappt werden konnte, + * false sonst */ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, int flags, size_t num_pages) @@ -475,14 +475,14 @@ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, va = (vaddr_t)((uintptr_t)vaddr + i * PAGE_SIZE * page_count); pa = (paddr_t)((uintptr_t)paddr + i * PAGE_SIZE * page_count); - if(map_page(context, va, pa, flags) != TRUE) + if(map_page(context, va, pa, flags) != true) { /* TODO: Das bereits geschehene Mapping rückgängig machen */ - return FALSE; + return false; } } - return TRUE; + return true; } /** @@ -492,8 +492,8 @@ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, * Adresse bezieht * @param vaddr Virtuelle Speicheradresse * - * @return TRUE, wenn die virtuelle Seite erfolgreich ungemappt werden konnte, - * FALSE sonst + * @return true, wenn die virtuelle Seite erfolgreich ungemappt werden konnte, + * false sonst */ bool mmc_unmap(mmc_context_t context, vaddr_t vaddr, size_t count) { @@ -502,11 +502,11 @@ bool mmc_unmap(mmc_context_t context, vaddr_t vaddr, size_t count) /*for (i = 0; i < count; i++) { if (!unmap_page(page_directory, vaddr + i * PAGE_SIZE)) { - return FALSE; + return false; } }*/ - return TRUE; + return true; } diff --git a/src/kernel2/src/arch/amd64/mm/mm_virt.c b/src/kernel2/src/arch/amd64/mm/mm_virt.c index 544b8cb..2b2e9c3 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_virt.c +++ b/src/kernel2/src/arch/amd64/mm/mm_virt.c @@ -63,9 +63,9 @@ void vmm_init(mmc_context_t context) // Wenn das entsprechende Bit gesetzt ist, duerfen wir es gefahrlos // benutzen. if ((features & (1 << 20)) != 0) { - mmc_use_no_exec = TRUE; + mmc_use_no_exec = true; } else { - mmc_use_no_exec = FALSE; + mmc_use_no_exec = false; } // Den Kernel mappen @@ -100,7 +100,7 @@ void vmm_init(mmc_context_t context) void vmm_init_local(mmc_context_t context) { // NXE aktivieren. - if (mmc_use_no_exec == TRUE) { + if (mmc_use_no_exec == true) { cpu_write_msr(0xC0000080, cpu_read_msr(0xC0000080) | (1 << 11)); } -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 16 13:43:14 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 16 Jan 2011 13:43:14 +0100 Subject: [tyndur-devel] [PATCH 02/11] kernel2: TRUE/FALSE durch true/false ersetzen In-Reply-To: <1295116506-469-1-git-send-email-m.nemo@gmx.net> References: <1295116506-469-1-git-send-email-m.nemo@gmx.net> Message-ID: <1295181794-15083-1-git-send-email-m.nemo@gmx.net> ! bool: Standard C Bezeichner für Boolean-Werte Signed-off-by: Andreas Freimuth --- src/kernel2/src/arch/amd64/im/im.c | 6 +- src/kernel2/src/arch/amd64/mm/mm_context.c | 68 ++++++++++++++-------------- src/kernel2/src/arch/amd64/mm/mm_virt.c | 6 +- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/kernel2/src/arch/amd64/im/im.c b/src/kernel2/src/arch/amd64/im/im.c index 2056524..791c8d9 100644 --- a/src/kernel2/src/arch/amd64/im/im.c +++ b/src/kernel2/src/arch/amd64/im/im.c @@ -599,7 +599,7 @@ void im_init() idt_set_gate(254, &im_int_stub_254, 0); idt_set_gate(255, &im_int_stub_255, 0); - use_apic = TRUE; + use_apic = true; } /** @@ -638,7 +638,7 @@ static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_le // TODO: Segment gehoert hier nicht hartkodiert hin idt[interrupt].segment = 0x8; idt[interrupt].type = IDT_GATE_TYPE_TRAP; - idt[interrupt].present = TRUE; + idt[interrupt].present = true; idt[interrupt].privilege_level = privilege_level; } @@ -650,7 +650,7 @@ static void idt_set_gate(size_t interrupt, vaddr_t handler, uint8_t privilege_le void im_end_of_interrupt(uint8_t interrupt) { // Nur mit dem traditionellen PIC - if (use_apic == FALSE) { + if (use_apic == false) { if ((interrupt >= IM_IRQ_BASE) && (interrupt <= IM_IRQ_BASE + 16)) { pic_eoi(interrupt - IM_IRQ_BASE); } diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel2/src/arch/amd64/mm/mm_context.c index b6d5274..fed401d 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_context.c +++ b/src/kernel2/src/arch/amd64/mm/mm_context.c @@ -49,7 +49,7 @@ */ /// Bestimmt ob das NX-Bit benutzt werden soll. -bool mmc_use_no_exec = FALSE; +bool mmc_use_no_exec = false; /** @@ -122,7 +122,7 @@ static void pm_free(mmc_pm_entry_t* pm) * * @param pm Pointer auf die Pagemap. Dieser muss gemappt sein. Am besten mit * pm_get. - * @param create Wenn TRUE, werden nicht existierende PDPTs erstellt und + * @param create Wenn true, werden nicht existierende PDPTs erstellt und * gemappt. * @param user Wenn die pdpt erstellt werden muss, bestimmt dieser Parameter ob * die pdpt fuer den Usermode bestimmt ist, oder nicht. @@ -138,7 +138,7 @@ static mmc_pdpt_entry_t* pdpt_get(mmc_pm_entry_t* pm, return vmm_kernel_automap((paddr_t) (pm[index] & PAGE_MASK), PAGE_SIZE); } else { - if (create == TRUE) { + if (create == true) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pdpt_entry_t* pdpt = vmm_kernel_automap(phys, PAGE_SIZE); @@ -176,7 +176,7 @@ static mmc_pd_entry_t* pd_get(mmc_pdpt_entry_t* pdpt, size_t index, return vmm_kernel_automap((paddr_t) (pdpt[index] & PAGE_MASK), PAGE_SIZE); } else { - if (create == TRUE) { + if (create == true) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pd_entry_t* pd = vmm_kernel_automap(phys, PAGE_SIZE); @@ -216,7 +216,7 @@ static mmc_pt_entry_t* pt_get(mmc_pd_entry_t* pd, size_t index, bool create, return vmm_kernel_automap((paddr_t) (pd[index] & PAGE_MASK), PAGE_SIZE); } else { - if ((create == TRUE) && ((pd[index] & 1) == 0)) { + if ((create == true) && ((pd[index] & 1) == 0)) { // Speicher allozieren paddr_t phys = pmm_alloc(1); mmc_pt_entry_t* pt = vmm_kernel_automap(phys, PAGE_SIZE); @@ -251,7 +251,7 @@ static void pt_free(mmc_pt_entry_t* pt) * * @param context Kontext aus dem das PD kommen soll * @param address Adresse ahnand welcher das PD gesucht werden soll - * @param create TRUE wenn die Strukturen erstellt werden sollen, FALSE wenn + * @param create true wenn die Strukturen erstellt werden sollen, false wenn * nicht. * @param user Wenn Stukturen erstellt werden, kann hiermit bestimmt werden, ob * fuer den Usermode bestimmt sein sollen. @@ -290,7 +290,7 @@ static mmc_pd_entry_t* pd_get_from_context(mmc_context_t context, * * @param context Kontext aus dem die Page table kommen soll * @param address Adresse ahnand welcher die Page table gesucht werden soll - * @param create TRUE wenn die Strukturen erstellt werden sollen, FALSE wenn + * @param create true wenn die Strukturen erstellt werden sollen, false wenn * nicht. * @param user Wenn Stukturen erstellt werden, kann hiermit bestimmt werden, ob * fuer den Usermode bestimmt sein sollen. @@ -338,36 +338,36 @@ static mmc_pt_entry_t* pt_get_from_context(mmc_context_t context, * @param paddr Physische Speicheradresse * @param flags Flags, die gesetzt werden sollen * - * @return TRUE, wenn die virtuelle Seite erfolgreich gemappt werden konnte, - * FALSE sonst. + * @return true, wenn die virtuelle Seite erfolgreich gemappt werden konnte, + * false sonst. */ static bool map_page (mmc_context_t context, vaddr_t vaddr, paddr_t paddr, int flags) { //kprintf("map 0x%16x => 0x%16x\n", vaddr, paddr); - bool big_page = FALSE; - bool user_page = FALSE; + bool big_page = false; + bool user_page = false; uint64_t internal_flags = flags; if ((flags & PAGE_FLAGS_BIG) != 0) { - big_page = TRUE; + big_page = true; } // Die NULL-Page bleibt aus Sicherheitsgruenden ungemappt if (vaddr == NULL) { panic("Versuchtes Mapping nach virtuell NULL"); - return FALSE; + return false; } // Die Adressen muessen beide auf 4K ausgerichtet sein. if ((((((uintptr_t) vaddr | (uintptr_t) paddr)) % PAGE_SIZE) != 0) && - (big_page == FALSE)) + (big_page == false)) { panic("Adressen sind nicht 4K-aligned (virt = %x, phys = %x)", vaddr, paddr); - return FALSE; + return false; } else if ((((((uintptr_t) vaddr | (uintptr_t) paddr)) % (PAGE_SIZE * 512)) - != 0) && (big_page == TRUE)) + != 0) && (big_page == true)) { panic("Adressen sind nicht 4M-aligned (virt = %x, phys = %x)", vaddr, paddr); @@ -375,16 +375,16 @@ static bool map_page // TODO:Flags pruefen. if ((internal_flags & PAGE_FLAGS_USER) != 0) { - user_page = TRUE; + user_page = true; } // Wenn das Nx-Bit gesetzt ist aber nicht benutzt werden darf, wird es // geloescht. Sonst wird das richtige NX-Bit gesetzt. - if ((mmc_use_no_exec == FALSE) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != + if ((mmc_use_no_exec == false) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != 0)) { internal_flags &= ~PAGE_FLAGS_NO_EXEC; - } else if ((mmc_use_no_exec == TRUE) && ((internal_flags & + } else if ((mmc_use_no_exec == true) && ((internal_flags & PAGE_FLAGS_NO_EXEC) != 0)) { internal_flags &= ~PAGE_FLAGS_NO_EXEC; @@ -392,8 +392,8 @@ static bool map_page } // Ab hier wird zwischen grossen und kleinen Pages unterschieden - if (big_page == TRUE) { - mmc_pd_entry_t* pd = pd_get_from_context(context, vaddr, TRUE, + if (big_page == true) { + mmc_pd_entry_t* pd = pd_get_from_context(context, vaddr, true, user_page); size_t index = PAGE_DIRECTORY_INDEX((uintptr_t) vaddr); @@ -410,14 +410,14 @@ static bool map_page pd_free(pd); } else { // PT anfordern, oder sie ggf. erstellen - mmc_pt_entry_t* pt = pt_get_from_context(context, vaddr, TRUE, + mmc_pt_entry_t* pt = pt_get_from_context(context, vaddr, true, user_page); size_t index = PAGE_TABLE_INDEX((uintptr_t) vaddr); // Wenn sie nicht angefordert werden konnte, ist der eintrag im PD // durch eine Grosse Page belegt. if (pt == NULL) { panic("Doppelbelegung im Page Directory. (0x%lx)", (uintptr_t) vaddr); - return FALSE; + return false; } // Wenn der entsprechende Eintrag in der PT nicht frei ist, wird auch @@ -427,7 +427,7 @@ static bool map_page panic("Doppelbelegung in einer Page Table. (0x%08x%08x => 0x%08x%08x)", ((uintptr_t) vaddr) >> 32, ((uintptr_t) vaddr) & 0xFFFFFFFF, ((uintptr_t) paddr) >> 32, ((uintptr_t) paddr) & 0xFFFFFFFF); - return FALSE; + return false; } // Wenn alles gut gelaufen ist, wirds jetzt ernst @@ -436,7 +436,7 @@ static bool map_page pt_free(pt); } - return TRUE; + return true; } /** @@ -453,8 +453,8 @@ static bool map_page * @param flags Flags * @param num Anzahl der Seiten * - * @return TRUE, wenn der bereich erfolgreich gemappt werden konnte, - * FALSE sonst + * @return true, wenn der bereich erfolgreich gemappt werden konnte, + * false sonst */ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, int flags, size_t num_pages) @@ -475,14 +475,14 @@ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, va = (vaddr_t)((uintptr_t)vaddr + i * PAGE_SIZE * page_count); pa = (paddr_t)((uintptr_t)paddr + i * PAGE_SIZE * page_count); - if(map_page(context, va, pa, flags) != TRUE) + if(map_page(context, va, pa, flags) != true) { /* TODO: Das bereits geschehene Mapping rückgängig machen */ - return FALSE; + return false; } } - return TRUE; + return true; } /** @@ -492,8 +492,8 @@ bool mmc_map(mmc_context_t context, vaddr_t vaddr, paddr_t paddr, * Adresse bezieht * @param vaddr Virtuelle Speicheradresse * - * @return TRUE, wenn die virtuelle Seite erfolgreich ungemappt werden konnte, - * FALSE sonst + * @return true, wenn die virtuelle Seite erfolgreich ungemappt werden konnte, + * false sonst */ bool mmc_unmap(mmc_context_t context, vaddr_t vaddr, size_t count) { @@ -502,11 +502,11 @@ bool mmc_unmap(mmc_context_t context, vaddr_t vaddr, size_t count) /*for (i = 0; i < count; i++) { if (!unmap_page(page_directory, vaddr + i * PAGE_SIZE)) { - return FALSE; + return false; } }*/ - return TRUE; + return true; } diff --git a/src/kernel2/src/arch/amd64/mm/mm_virt.c b/src/kernel2/src/arch/amd64/mm/mm_virt.c index 544b8cb..2b2e9c3 100644 --- a/src/kernel2/src/arch/amd64/mm/mm_virt.c +++ b/src/kernel2/src/arch/amd64/mm/mm_virt.c @@ -63,9 +63,9 @@ void vmm_init(mmc_context_t context) // Wenn das entsprechende Bit gesetzt ist, duerfen wir es gefahrlos // benutzen. if ((features & (1 << 20)) != 0) { - mmc_use_no_exec = TRUE; + mmc_use_no_exec = true; } else { - mmc_use_no_exec = FALSE; + mmc_use_no_exec = false; } // Den Kernel mappen @@ -100,7 +100,7 @@ void vmm_init(mmc_context_t context) void vmm_init_local(mmc_context_t context) { // NXE aktivieren. - if (mmc_use_no_exec == TRUE) { + if (mmc_use_no_exec == true) { cpu_write_msr(0xC0000080, cpu_read_msr(0xC0000080) | (1 << 11)); } -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 16 17:02:41 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 16 Jan 2011 17:02:41 +0100 Subject: [tyndur-devel] [PATCH] build: Tool-Pfade nach Makefile.local Message-ID: <1295193761-9625-1-git-send-email-m.nemo@gmx.net> ! buildmk.sh: Compilerprefix und Unterschiede zwischen den Architekturen führen zu Veränderungen im Root-Makefile Signed-off-by: Andreas Freimuth --- Makefile | 6 +++--- buildmk.sh | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a99b53e..74f0b24 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -include Makefile.local -CC=gcc -m32 -g -c -fno-stack-protector -nostdinc -fno-leading-underscore -fno-omit-frame-pointer -Wall -Werror -Wstrict-prototypes -fno-strict-aliasing -O2 -fno-builtin -I . -CPP=g++ -m32 -g -c -fno-stack-protector -fno-leading-underscore -fno-omit-frame-pointer -Wall -fno-strict-aliasing -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-use-cxa-atexit -O0 +CC=$(CC_BINARY) +CPP=$(CPP_BINARY) PPC=$(PPC_BINARY) -n -Cn -CX -Ttyndur -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 @@ -9,7 +9,7 @@ ASM_BIN=nasm -fbin -O99 BUILD_DIR=$(BUILD_ROOT) -AS=as -32 +AS=$(AS_BINARY) all: $(MAKE) --no-print-directory -s makefiles diff --git a/buildmk.sh b/buildmk.sh index 725728a..f5dd580 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -85,6 +85,9 @@ fi if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then cat < Makefile.local BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output +AS_BINARY=$LOST_TOOLS_AS +CC_BINARY=$LOST_TOOLS_GCC +CPP_BINARY=$LOST_TOOLS_GPP PPC_BINARY=$LOST_TOOLS_PPC EOF @@ -106,8 +109,8 @@ fi cat <> Makefile -CC=$LOST_TOOLS_GCC $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND -CPP=$LOST_TOOLS_GPP $INCLUDES +CC=\$(CC_BINARY) $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND +CPP=\$(CPP_BINARY) $INCLUDES PPC=\$(PPC_BINARY) -n -Cn -CX -Ttyndur $FPCINCLUDES -Fu../lib/units -Fu../units ASM_ELF=nasm -felf -O99 $NASMINCLUDES @@ -115,7 +118,7 @@ ASM_BIN=nasm -fbin -O99 BUILD_DIR=`pwd | sed s#^$LOST_BUILDMK_ROOT#\$\(BUILD_ROOT\)#` -AS=$LOST_TOOLS_AS +AS=\$(AS_BINARY) all: EOF -- 1.7.3.4 From m.nemo at gmx.net Sun Jan 16 17:09:42 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Sun, 16 Jan 2011 17:09:42 +0100 Subject: [tyndur-devel] [PATCH] build: Tool-Pfade nach Makefile.local In-Reply-To: <1295193761-9625-1-git-send-email-m.nemo@gmx.net> References: <1295193761-9625-1-git-send-email-m.nemo@gmx.net> Message-ID: <4D331846.7060100@gmx.net> Eigentlich ist es ja schon merkwürdig sich Mühe zu machen, dass ein auto-generiertes Makefile immer gleich aussieht. Eventuell ist es Sinnvoll das Root-Makefile nicht auto-generieren zu lassen xD. -- Andreas Freimuth From hartmut at tyndur.org Wed Jan 19 10:11:56 2011 From: hartmut at tyndur.org (hartmut at tyndur.org) Date: Wed, 19 Jan 2011 01:11:56 -0800 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH=5D_/modules/sysinfo=3A_/ram_hin?= =?utf-8?b?enVnZWbDvGd0?= Message-ID: <1295428316-2093-1-git-send-email-hartmut@tyndur.org> From: Alexander Hartmut Kluth + sysinfo.c: /ram hinzugefügt, speichert den verfügbaren Arbeitsspeicher im System in Bytes Signed-off-by: Alexander Hartmut Kluth --- src/modules/sysinfo/sysinfo.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/modules/sysinfo/sysinfo.c b/src/modules/sysinfo/sysinfo.c index 2eeeca4..79eac24 100644 --- a/src/modules/sysinfo/sysinfo.c +++ b/src/modules/sysinfo/sysinfo.c @@ -39,6 +39,8 @@ #include "stdlib.h" #include "lostio.h" #include "string.h" +#include +#include "syscall.h" #include "cpuid.h" @@ -125,6 +127,24 @@ void sysinfo_create_cpuid_file(void) } /** + * Legt die Datei /ram unter sysinfo:/ ein, welche den Arbeitsspeicher in + * Byte angibt + **/ +void sysinfo_create_ram_file(void) +{ + memory_info_t meminfo = memory_info(); + + char filename[] = "/ram"; + int size; + char* content = malloc(4096); + + size = sprintf(content, "%i", meminfo.total); + + vfstree_create_node(filename, LOSTIO_TYPES_RAMFILE, size, content, 0); + +} + +/** * main von sysinfo. Initialisiert LostIO und exportiert alle vorhandenen * Systeminfos nach aussen. * @@ -144,6 +164,9 @@ int main(int argc, char* argv[]) // /cpu anlegen - enthaelt Infos ueber die CPU, Basis hierfuer ist cpuid.c sysinfo_create_cpuid_file(); + // /ram anlegen - enthaelt Infos ueber den verfuegbaren Arbeitsspeicher + sysinfo_create_ram_file(); + // Letztendlich bei Init registrieren init_service_register("sysinfo"); -- 1.7.1 From shyxormz at asxsoft.de Wed Jan 19 15:36:27 2011 From: shyxormz at asxsoft.de (Patrick Pokatilo) Date: Wed, 19 Jan 2011 15:36:27 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH=5D_/modules/sysinfo=3A_/ra?= =?iso-8859-1?q?m_hinzugef=FCgt?= In-Reply-To: <1295428316-2093-1-git-send-email-hartmut@tyndur.org> References: <1295428316-2093-1-git-send-email-hartmut@tyndur.org> Message-ID: <1295447787.2321.4.camel@ASXSoft-Mobile> 2011-01-19 (?) ? 01:11 -0800 ? hartmut at tyndur.org ????????: > + sysinfo.c: /ram hinzugefügt, speichert den verfügbaren Arbeitsspeicher im System in Bytes > > Signed-off-by: Alexander Hartmut Kluth Acked-by: Patrick Pokatilo From kevin at tyndur.org Sun Jan 23 18:19:39 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sun, 23 Jan 2011 18:19:39 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_01/11=5D_kernel2=3A_TSS-St?= =?iso-8859-1?q?ruktur_f=FCr__arch/amd64?= In-Reply-To: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> References: <1295115491-31710-1-git-send-email-m.nemo@gmx.net> Message-ID: <20110123171939.GB7457@silvanus> On Sat, Jan 15, 2011 at 07:18:01PM +0100, Andreas Freimuth wrote: > Signed-off-by: Andreas Freimuth Danke, sind jetzt alle drin (inklusive dem zusätzlichen buildmk.sh-Patch) Kevin From kevin at tyndur.org Sun Jan 23 18:28:30 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sun, 23 Jan 2011 18:28:30 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH=5D_Makefile=3A_Pascal-RTL_f?= =?utf-8?q?=C3=BCr_lbuilds_vorbereiten?= Message-ID: <1295803710-31712-1-git-send-email-kevin@tyndur.org> + Makefile: Nachdem die Umgebung soweit aufgesetzt ist, dass man Pascalprogramme bauen kann, kann man auch die RTL noch durchbauen und mit einem zweiten update_env zur Verfügung stellen Signed-off-by: Kevin Wolf --- buildmk.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/buildmk.sh b/buildmk.sh index f5dd580..3289279 100644 --- a/buildmk.sh +++ b/buildmk.sh @@ -272,6 +272,8 @@ lbuilds-env: touch lbuilds/.nobuild cd lbuilds && scripts/build_crosstools && scripts/update_env \`dirname \\\`pwd\\\`\` && ln -sf \`pwd\`/tmp/cross-fpc/fpc-2.4.0/rtl/ \`dirname \\\`pwd\\\`\`/src/modules/pas/lib/rtl/include make enable-pascal + \$(MAKE) + cd lbuilds && scripts/update_env .. enable-pascal: touch src/modules/pas/.ignorenobuild -- 1.6.0.2 From arne.hasselbring at googlemail.com Mon Jan 24 18:39:22 2011 From: arne.hasselbring at googlemail.com (Arne Hasselbring) Date: Mon, 24 Jan 2011 18:39:22 +0100 Subject: [tyndur-devel] [PATCH] lpt: Filter beim Auflisten Message-ID: <1295890762-1898-1-git-send-email-arne.hasselbring@googlemail.com> + Durch Eingabe von lpt list --filter [installed|notinstalled] werden nur installierte bzw. nicht installierte Pakete angezeigt --- src/modules/pas/lpt/lpt.pas | 119 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 118 insertions(+), 1 deletions(-) diff --git a/src/modules/pas/lpt/lpt.pas b/src/modules/pas/lpt/lpt.pas index 5705d97..1ab91f8 100644 --- a/src/modules/pas/lpt/lpt.pas +++ b/src/modules/pas/lpt/lpt.pas @@ -295,6 +295,111 @@ begin end; end; + +procedure ListInstalled; +var + srec: SearchRec; + pkgset: TPackageSet; + pkg: TPackage; + sect: TPackageSection; + ver: TPackageVersion; + dep: TDependency; + + repo: TRepository; + + i, j, k, l: integer; + filename: String; +begin + ReadPkgsrc(getConfigRoot + 'pkgsrc'); + pkgset := TPackageSet.create; + ReadPkglists(pkgset); + + for i := 0 to pkgset.packages.count - 1 do begin + pkg := TPackage(pkgset.packages.items[i]); + for j := 0 to pkg.sections.count - 1 do begin + sect := TPackageSection(pkg.sections.items[j]); + for k := 0 to sect.versions.count - 1 do begin + ver := TPackageVersion(sect.versions.items[k]); + filename := 'file:/packages/' + ver.pkg.name + '/' + + ver.version + '/' + ver.section.section + '/'; + + if FileExists(filename) then begin + Write(pkg.name, StringOfChar(' ', 12 - Length(pkg.name))); + Write(' | ', sect.section, StringOfChar(' ', 5 - Length(sect.section))); + Write(' | ', ver.version : 10); + if Length(pkg.desc) > 43 then begin + WriteLn(' | ' + Copy(pkg.desc, 1, 40), '...'); + end else begin + WriteLn(' | ' + pkg.desc); + end; + + for l := 0 to ver.preinstDependencies.count - 1 do begin + dep := TDependency(ver.preinstDependencies.items[l]); + WriteLn('' : 36, rsListInstallDependency, dep.pkgname + ' (' + dep.section + ')'); + end; + + for l := 0 to ver.runDependencies.count - 1 do begin + dep := TDependency(ver.runDependencies.items[l]); + WriteLn('' : 36, rsListRunDependency, dep.pkgname + ' (' + dep.section + ')'); + end; + end; + end; + end; + end; +end; + + +procedure ListNotInstalled; +var + srec: SearchRec; + pkgset: TPackageSet; + pkg: TPackage; + sect: TPackageSection; + ver: TPackageVersion; + dep: TDependency; + + repo: TRepository; + + i, j, k, l: integer; + filename: String; +begin + ReadPkgsrc(getConfigRoot + 'pkgsrc'); + pkgset := TPackageSet.create; + ReadPkglists(pkgset); + + for i := 0 to pkgset.packages.count - 1 do begin + pkg := TPackage(pkgset.packages.items[i]); + for j := 0 to pkg.sections.count - 1 do begin + sect := TPackageSection(pkg.sections.items[j]); + for k := 0 to sect.versions.count - 1 do begin + ver := TPackageVersion(sect.versions.items[k]); + filename := 'file:/packages/' + ver.pkg.name + '/' + + ver.version + '/' + ver.section.section + '/'; + if not FileExists(filename) then begin + Write(pkg.name, StringOfChar(' ', 12 - Length(pkg.name))); + Write(' | ', sect.section, StringOfChar(' ', 5 - Length(sect.section))); + Write(' | ', ver.version : 10); + if Length(pkg.desc) > 43 then begin + WriteLn(' | ' + Copy(pkg.desc, 1, 40), '...'); + end else begin + WriteLn(' | ' + pkg.desc); + end; + + for l := 0 to ver.preinstDependencies.count - 1 do begin + dep := TDependency(ver.preinstDependencies.items[l]); + WriteLn('' : 36, rsListInstallDependency, dep.pkgname + ' (' + dep.section + ')'); + end; + + for l := 0 to ver.runDependencies.count - 1 do begin + dep := TDependency(ver.runDependencies.items[l]); + WriteLn('' : 36, rsListRunDependency, dep.pkgname + ' (' + dep.section + ')'); + end; + end; + end; + end; + end; +end; + function c_lostio_create_link(target, link: PChar; hard: boolean): integer; cdecl; external name 'io_create_link'; procedure CfgAddbin(path, pubname: String); @@ -358,7 +463,19 @@ begin if system.ParamStr(1) = 'scan' then begin Scan; end else if system.ParamStr(1) = 'list' then begin - List; + if system.ParamCount = 1 then begin + List; + end else if system.ParamCount = 3 then begin + if system.ParamStr(2) = '--filter' then begin + if system.ParamStr(3) = 'installed' then begin + ListInstalled; + end else if system.ParamStr(3) = 'notinstalled' then begin + ListNotInstalled; + end; + end; + end else begin + WriteLn(rsWrongParamCount); + end; end else if system.ParamStr(1) = 'get' then begin if system.ParamCount = 2 then begin Get(system.ParamStr(2), false); -- 1.7.1 From arne.hasselbring at googlemail.com Wed Jan 26 16:42:27 2011 From: arne.hasselbring at googlemail.com (Arne Hasselbring) Date: Wed, 26 Jan 2011 16:42:27 +0100 Subject: [tyndur-devel] [PATCH] + grep: Neuer lbuild Message-ID: <1296056547-31635-1-git-send-email-arne.hasselbring@googlemail.com> Signed-off-by: Arne Hasselbring --- lbuilds/grep/2.7/files/all.patch | 25 ++++++++++++++++ lbuilds/grep/2.7/files/configure.patch | 39 +++++++++++++++++++++++++ lbuilds/grep/2.7/grep-2.7.lbuild | 50 ++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 0 deletions(-) create mode 100644 lbuilds/grep/2.7/files/all.patch create mode 100644 lbuilds/grep/2.7/files/configure.patch create mode 100644 lbuilds/grep/2.7/grep-2.7.lbuild diff --git a/lbuilds/grep/2.7/files/all.patch b/lbuilds/grep/2.7/files/all.patch new file mode 100644 index 0000000..d09ce1d --- /dev/null +++ b/lbuilds/grep/2.7/files/all.patch @@ -0,0 +1,25 @@ +Index: grep-2.7/lib/inttypes.in.h +=================================================================== +--- grep-2.7.orig/lib/inttypes.in.h ++++ grep-2.7/lib/inttypes.in.h +@@ -46,5 +46,5 @@ #include + +-#if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) +-# error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to ." +-#endif ++//#if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) ++//# error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to ." ++//#endif + +Index: grep-2.7/lib/error.c +=================================================================== +--- grep-2.7.orig/lib/error.c ++++ grep-2.7/lib/error.c +@@ -126,5 +126,5 @@ # else + +-# ifndef F_GETFL +-# error Please port fcntl to your platform +-# endif ++//# ifndef F_GETFL ++//# error Please port fcntl to your platform ++//# endif diff --git a/lbuilds/grep/2.7/files/configure.patch b/lbuilds/grep/2.7/files/configure.patch new file mode 100644 index 0000000..4646bfb --- /dev/null +++ b/lbuilds/grep/2.7/files/configure.patch @@ -0,0 +1,39 @@ +Index: grep-2.7/configure +=================================================================== +--- grep-2.7.orig/configure ++++ grep-2.7/configure +@@ -3668,35 +3668,4 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +-$as_echo_n "checking host system type... " >&6; } +-if ${ac_cv_host+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "x$host_alias" = x; then +- ac_cv_host=$ac_cv_build +-else +- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +-fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +-$as_echo "$ac_cv_host" >&6; } +-case $ac_cv_host in +-*-*-*) ;; +-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +-esac +-host=$ac_cv_host +-ac_save_IFS=$IFS; IFS='-' +-set x $ac_cv_host +-shift +-host_cpu=$1 +-host_vendor=$2 +-shift; shift +-# Remember, the first character of IFS is used to create $*, +-# except with old shells: +-host_os=$* +-IFS=$ac_save_IFS +-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + diff --git a/lbuilds/grep/2.7/grep-2.7.lbuild b/lbuilds/grep/2.7/grep-2.7.lbuild new file mode 100644 index 0000000..200310e --- /dev/null +++ b/lbuilds/grep/2.7/grep-2.7.lbuild @@ -0,0 +1,50 @@ +include lutils +include toolchain + +DESCRIPTION="" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Grep" +SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.7.tar.gz" + +LICENSE="GPL" + +RUN_DEPEND="" +BUILD_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.gz + cd ${MY_S} + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + + ./configure \ + CC=`tc-cc` \ + --build=`tc-build` \ + --target=`tc-host` \ + --host=`tc-host` \ + --prefix="${R}" \ + --disable-nls \ + || die "configure failed" +} + +src_compile() { + cd ${MY_S} + lmake +} + +src_install() { + cd ${MY_S} + lmake -j1 DESTDIR="${D}" install || die "make install failed" +} + -- 1.7.1 From arne.hasselbring at googlemail.com Fri Jan 28 17:57:45 2011 From: arne.hasselbring at googlemail.com (Arne Hasselbring) Date: Fri, 28 Jan 2011 17:57:45 +0100 Subject: [tyndur-devel] [PATCH] Neue Stubs Message-ID: <1296233865-1633-1-git-send-email-arne.hasselbring@googlemail.com> + Stubs für setuid, setgid, seteuid, setegid Signed-off-by: Arne Hasselbring --- src/modules/include/unistd.h | 12 ++++++++++++ src/modules/lib/posix/user.c | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/modules/include/unistd.h b/src/modules/include/unistd.h index 100e3b7..3532f1a 100644 --- a/src/modules/include/unistd.h +++ b/src/modules/include/unistd.h @@ -169,6 +169,18 @@ gid_t getgid(void); /// Gibt die effektive Gruppen-ID zurueck gid_t getegid(void); +/// Setzt die Gruppen-ID +int setgid(gid_t gid); + +/// Setzt die Benutzer-ID +int setuid(uid_t uid); + +/// Setzt die effektive Benutzer-ID +int seteuid(uid_t euid); + +/// Setzt die effektive Gruppen-ID +int setegid(gid_t egid); + /// Gibt den Hostnamen dieses Rechners zurueck int gethostname(char* buf, size_t len); diff --git a/src/modules/lib/posix/user.c b/src/modules/lib/posix/user.c index f41c895..bf520e9 100644 --- a/src/modules/lib/posix/user.c +++ b/src/modules/lib/posix/user.c @@ -42,6 +42,18 @@ uid_t geteuid(void) return 0; } +/// Setzt die Benutzer-ID +int setuid(uid_t uid) +{ + return 0; +} + +/// Setzt die effektive Benutzer-ID +int seteuid(uid_t euid) +{ + return 0; +} + /// Gibt die aktuelle Gruppen-ID zurueck gid_t getgid(void) { @@ -54,4 +66,16 @@ gid_t getegid(void) return 0; } +/// Setzt die Gruppen-ID +int setgid(gid_t gid) +{ + return 0; +} + +/// Setzt die effektive Gruppen-ID +int setegid(gid_t egid) +{ + return 0; +} + #endif -- 1.7.1 From arne.hasselbring at googlemail.com Fri Jan 28 18:01:32 2011 From: arne.hasselbring at googlemail.com (Arne Hasselbring) Date: Fri, 28 Jan 2011 18:01:32 +0100 Subject: [tyndur-devel] [PATCH] git: Stubs Message-ID: <1296234092-1695-1-git-send-email-arne.hasselbring@googlemail.com> * In compat/tyndur.h müssen keine Stubs mehr für setuid und setgid sein Signed-off-by: Arne Hasselbring --- lbuilds/git/1.6.4/patches/compile.patch | 21 +-------------------- 1 files changed, 1 insertions(+), 20 deletions(-) diff --git a/lbuilds/git/1.6.4/patches/compile.patch b/lbuilds/git/1.6.4/patches/compile.patch index 233eb58..deebb17 100644 --- a/lbuilds/git/1.6.4/patches/compile.patch +++ b/lbuilds/git/1.6.4/patches/compile.patch @@ -83,7 +83,7 @@ Index: src/git-1.6.4/compat/tyndur.h =================================================================== --- /dev/null +++ src/git-1.6.4/compat/tyndur.h -@@ -0,0 +1,157 @@ +@@ -0,0 +1,147 @@ +#ifndef COMPAT_TYNDUR_H +#define COMPAT_TYNDUR_H + @@ -176,16 +176,6 @@ Index: src/git-1.6.4/compat/tyndur.h + return getpid(); +} + -+static int setuid(uid_t uid) -+{ -+ return 0; -+} -+ -+static int setgid(gid_t gid) -+{ -+ return 0; -+} -+ +static int initgroups(const char *user, gid_t group) +{ + return 0; @@ -371,15 +361,6 @@ Index: src/git-1.6.4/run-command.c fflush(NULL); cmd->pid = fork(); if (!cmd->pid) { -Index: src/git-1.6.4/write_or_die.c -=================================================================== ---- src.orig/git-1.6.4/write_or_die.c -+++ src/git-1.6.4/write_or_die.c -@@ -1,3 +1,4 @@ -+#include "compat/tyndur.h" - #include "cache.h" - - /* Index: src/git-1.6.4/daemon.c =================================================================== --- src.orig/git-1.6.4/daemon.c -- 1.7.1 From max at tyndur.org Fri Jan 28 22:25:27 2011 From: max at tyndur.org (Max Reitz) Date: Fri, 28 Jan 2011 22:25:27 +0100 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH=5D_cdi=3A_Fix_f=FCr_das_Ei?= =?iso-8859-1?q?nlesen_von_Ressourcen?= In-Reply-To: <1292927629-31548-1-git-send-email-kevin@tyndur.org> References: <1292927629-31548-1-git-send-email-kevin@tyndur.org> Message-ID: <4D433447.4000300@tyndur.org> Am 21.12.2010 11:33, schrieb Kevin Wolf: > ! cdi: Der pci-Service gibt nicht nur Speicher- und I/O-Port-Bereich als > Ressourcen zurück, sondern auch IRQs. Wenn man die in die BAR-Liste > einträgt ist das doof und gibt manchmal rot. > > Signed-off-by: Kevin Wolf > Da dies bis jetzt noch nicht im Repo ist... Acked-by: Max Reitz From arne.hasselbring at googlemail.com Sat Jan 29 10:20:18 2011 From: arne.hasselbring at googlemail.com (Arne Hasselbring) Date: Sat, 29 Jan 2011 10:20:18 +0100 Subject: [tyndur-devel] [PATCH] Neue POSIX-Funktionen Message-ID: <1296292818-4026-1-git-send-email-arne.hasselbring@googlemail.com> + truncate und ftruncate hinzugefügt Signed-off-by: Arne Hasselbring --- src/modules/include/unistd.h | 6 +++ src/modules/lib/posix/trunc.c | 88 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 0 deletions(-) create mode 100644 src/modules/lib/posix/trunc.c diff --git a/src/modules/include/unistd.h b/src/modules/include/unistd.h index 3532f1a..db4e426 100644 --- a/src/modules/include/unistd.h +++ b/src/modules/include/unistd.h @@ -125,6 +125,12 @@ long alarm(long seconds); /// Gibt die Groesse einer Page zurueck int getpagesize(void); +/// Datei auf eine bestimmte Länge setzen +int truncate(const char *path, off_t length); + +/// Datei anhand des Deskriptors auf eine bestimmte Länge setzen +int ftruncate(int fd, off_t length); + /** * Einen symbolischen Link anlegen * diff --git a/src/modules/lib/posix/trunc.c b/src/modules/lib/posix/trunc.c new file mode 100644 index 0000000..df5e882 --- /dev/null +++ b/src/modules/lib/posix/trunc.c @@ -0,0 +1,88 @@ +#include +#include +#include +#include +#include +#include + +int truncate(const char *path, off_t length) +{ + FILE *handle = fopen(path, "a+"); + if (handle == NULL) { + errno = ENOENT; + return -1; + } + fseek(handle, 0, SEEK_END); + int cur_len = ftell(handle); + int diff = length - cur_len; + if (diff == 0) { + return 0; + } + if (diff < 0) { + char *data = malloc(cur_len); + fseek(handle, 0, SEEK_SET); + fread(data, cur_len, 1, handle); + char *buffer = malloc(length); + memcpy(buffer, data, length); + free(data); + fclose(handle); + handle = fopen(path, "w"); + fwrite(buffer, length, 1, handle); + free(buffer); + fclose(handle); + return 0; + } else if (diff > 0) { + fseek(handle, 0, SEEK_END); + int i; + for (i = 0; i < diff; i++) { + fprintf(handle, "%c", 0); + } + fclose(handle); + return 0; + } else { + errno = EAGAIN; + return -1; + } +} + + +int ftruncate(int fd, off_t length) +{ + FILE *handle = fdopen(fd, "a+"); + if (handle == NULL) { + errno = ENOENT; + return -1; + } + fseek(handle, 0, SEEK_END); + int cur_len = ftell(handle); + int diff = length - cur_len; + if (diff == 0) { + return 0; + } + if (diff < 0) { + char *data = malloc(cur_len); + fseek(handle, 0, SEEK_SET); + fread(data, cur_len, 1, handle); + char *buffer = malloc(length); + memcpy(buffer, data, length); + free(data); + fclose(handle); + remove(handle->path); + handle = fdopen(fd, "w"); + fwrite(buffer, length, 1, handle); + free(buffer); + fclose(handle); + return 0; + } else if (diff > 0) { + fseek(handle, 0, SEEK_END); + int i; + for (i = 0; i < diff; i++) { + fprintf(handle, "%c", 0); + } + fclose(handle); + return 0; + } else { + errno = EAGAIN; + return -1; + } +} -- 1.7.1 From max at tyndur.org Sat Jan 29 12:29:39 2011 From: max at tyndur.org (Max Reitz) Date: Sat, 29 Jan 2011 12:29:39 +0100 Subject: [tyndur-devel] [PATCH] Neue POSIX-Funktionen In-Reply-To: <1296292818-4026-1-git-send-email-arne.hasselbring@googlemail.com> References: <1296292818-4026-1-git-send-email-arne.hasselbring@googlemail.com> Message-ID: <4D43FA23.4080404@tyndur.org> Am 29.01.2011 10:20, schrieb Arne Hasselbring: > + truncate und ftruncate hinzugefügt > > Signed-off-by: Arne Hasselbring > [...] > diff --git a/src/modules/lib/posix/trunc.c b/src/modules/lib/posix/trunc.c > new file mode 100644 > index 0000000..df5e882 > --- /dev/null > +++ b/src/modules/lib/posix/trunc.c > [...] > + if (diff < 0) { > + char *data = malloc(cur_len); > + fseek(handle, 0, SEEK_SET); > + fread(data, cur_len, 1, handle); > + char *buffer = malloc(length); > + memcpy(buffer, data, length); > + free(data); > + fclose(handle); > + handle = fopen(path, "w"); > + fwrite(buffer, length, 1, handle); > + free(buffer); > + fclose(handle); > + return 0; > Hm, auf die Art und Weise dauert das aber ziemlich lange... Also meiner Meinung nach sollte man da warten, bis LIOv2 in master ist und dann die anscheinend existierende Funktion lio_trunc benutzen (sofern sie das macht, was sie vorgibt zu tun). > + } else if (diff > 0) { > + fseek(handle, 0, SEEK_END); > + int i; > + for (i = 0; i < diff; i++) { > + fprintf(handle, "%c", 0); > fprintf ist hier wohl eher ein Overkill, fputc reicht doch, wobei es wohl noch besser wäre, wenn man ganze Speicherblöcke mit Nullen auf einmal schreibt. > + } > + fclose(handle); > + return 0; > + } else { > + errno = EAGAIN; > + return -1; > Wieso ist es ein Fehler, wenn die Dateigröße auf die aktuelle Größe gesetzt werden soll (diff == 0)? > + } > +} Wie bereits gesagt, ich würde da eigentlich eher auf LIOv2 warten (oder diese Funktion auf LIOv1-Ebene implementieren), denn wenn man von einer Datei nur das letzte Byte abschneiden will, wird hier die gesamte Datei neu geschrieben und das finde ich persönlich nicht so optimal. From max at tyndur.org Sat Jan 29 13:38:33 2011 From: max at tyndur.org (max at tyndur.org) Date: Sat, 29 Jan 2011 13:38:33 +0100 Subject: [tyndur-devel] [PATCH 0/5] CDI/audio Message-ID: <1296304718-8845-1-git-send-email-max@tyndur.org> Nachdem der AC97-Treiber und der Nixer so weit von Fehlern befreit wurden, dass sie auf qemu funktionieren, fasst diese Patchserie die Änderungen zusammen, die nötig sind, um Signifanten auf týndur tröten lassen zu können. Dazu gehören: - IRQ-Sharing für kernel2 (sah im RPC-Benchmark nicht allzu schlecht aus (IRQ-Benchmarks gestalten sich eher schwierig)) - eine kleine Änderung an der Art, wie der PCI-Treiber den Ressourcenindex bestimmt - eine minimale CDI/audio-Implementierung - der AC97-Treiber - ein minimales Mixerinterface für Anwendungen in Form eines Nichtmixers From max at tyndur.org Sat Jan 29 13:38:34 2011 From: max at tyndur.org (max at tyndur.org) Date: Sat, 29 Jan 2011 13:38:34 +0100 Subject: [tyndur-devel] [PATCH 1/5] kernel2: IRQ-Sharing In-Reply-To: <1296304718-8845-1-git-send-email-max@tyndur.org> References: <1296304718-8845-1-git-send-email-max@tyndur.org> Message-ID: <1296304718-8845-2-git-send-email-max@tyndur.org> From: Max Reitz + Bis zu vier Tasks können jetzt beim Auftreten eines IRQs benachrichtigt werden. Signed-off-by: Max Reitz --- src/kernel2/src/interrupts/im.c | 89 ++++++++++++++++++++++++++++---------- 1 files changed, 65 insertions(+), 24 deletions(-) diff --git a/src/kernel2/src/interrupts/im.c b/src/kernel2/src/interrupts/im.c index d266959..96bfdd9 100644 --- a/src/kernel2/src/interrupts/im.c +++ b/src/kernel2/src/interrupts/im.c @@ -33,6 +33,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include @@ -51,8 +52,18 @@ extern size_t cpu_count; /** Einheit: Mikrosekunden */ uint64_t timer_ticks = 0; -static pm_process_t* intr_handling_task[IM_NUM_INTERRUPTS]; -static uint32_t intr_to_send[IM_NUM_INTERRUPTS]; +#define MAX_INTERRUPTS 4 + +// Wenn mehrere Tasks für einen Interrupt registriert sind, dann werden sie im +// Array so angeordnet, dass nur die ersten Einträge gefüllt sind +static pm_process_t* intr_handling_task[IM_NUM_INTERRUPTS][MAX_INTERRUPTS]; +static uint32_t intr_to_send[IM_NUM_INTERRUPTS][MAX_INTERRUPTS]; +// Anzahl von Tasks pro Interrupt +static int intr_num_tasks[IM_NUM_INTERRUPTS]; +// Gibt an, ob überhaupt irgendein Interrupt für die jeweilige Nummer +// auszuliefern ist (ist also false, wenn alle intr_to_send-Einträge für den +// Interrupt 0 sind, sonst true). +static bool any_intr[IM_NUM_INTERRUPTS]; void im_send_interrupts(void); bool fastrpc_irq(pm_process_t* callee, size_t metadata_size, void* metadata, @@ -193,7 +204,11 @@ interrupt_stack_frame_t* im_handler(interrupt_stack_frame_t* isf) // Timer ausloesen, wenn noetig timer_notify(timer_ticks); } else { - intr_to_send[int_num]++; + int i; + for (i = 0; i < intr_num_tasks[int_num]; i++) { + intr_to_send[int_num][i]++; + } + any_intr[int_num] = true; im_disable_irq(int_num - IM_IRQ_BASE); } } else if (int_num == 0x30) { @@ -261,12 +276,25 @@ static void on_process_destroy(pm_process_t* process, void* prv) panic("im.c: on_process_destroy(): Korrupte Interruptnummer %d", intr); } - if (intr_handling_task[intr] != process) { - panic("im.c: on_process_destroy(): Prozess nicht fuer Interrupt %d " - "zustaendig", intr); + int i, j; + for (i = 0; i < intr_num_tasks[intr]; i++) { + if (intr_handling_task[intr][i] == process) { + intr_handling_task[intr][i] = NULL; + + // Nach vorn schieben, sodass immer nur die vorderen Plätze des + // Arrays belegt sind + for (j = --intr_num_tasks[intr]; j > i; j--) { + if (intr_handling_task[intr][j] != NULL) { + intr_handling_task[intr][i] = intr_handling_task[intr][j]; + } + } + + return; + } } - intr_handling_task[intr] = NULL; + panic("im.c: on_process_destroy(): Prozess nicht fuer Interrupt %d " + "zustaendig", intr); } /** @@ -280,16 +308,21 @@ static void on_process_destroy(pm_process_t* process, void* prv) */ bool im_add_handler(uint32_t intr, pm_process_t* handler) { - if ((intr >= IM_NUM_INTERRUPTS) || intr_handling_task[intr]) { + if (intr >= IM_NUM_INTERRUPTS) { return false; } - intr_handling_task[intr] = handler; + if (intr_num_tasks[intr] >= MAX_INTERRUPTS) { + // Kein Platz für diesen IRQ mehr übrig + return false; + } + + intr_handling_task[intr][intr_num_tasks[intr]++] = handler; pm_register_on_destroy(handler, on_process_destroy, (void*) intr); // Moeglicherweise ist der IRQ frueher maskiert worden, weil es keinen // Treiber dafuer gab. Spaetestens jetzt brauchen wir ihn aber wieder. - if ((intr >= IM_IRQ_BASE) && (intr< (IM_IRQ_BASE + 16))) { + if ((intr >= IM_IRQ_BASE) && (intr < (IM_IRQ_BASE + 16))) { im_enable_irq(intr - IM_IRQ_BASE); } @@ -307,23 +340,31 @@ void im_send_interrupts(void) for (intr = 0; intr < IM_NUM_INTERRUPTS; intr++) { - while (intr_to_send[intr] > 0) { - if (intr_handling_task[intr] == NULL) { - intr_to_send[intr] = 0; - break; - } + if (!any_intr[intr]) { + continue; + } - // Dieses Wechseln des Tasks ist wichtig: IRQs werden nur - // angenommen, wenn der Task sie sich selbst schickt - current_thread = new_thread = - list_get_element_at(intr_handling_task[intr]->threads, 0); + any_intr[intr] = false; + + int i; + for (i = 0; i < intr_num_tasks[intr]; i++) { + while (intr_to_send[intr][i] > 0) { + // Dieses Wechseln des Tasks ist wichtig: IRQs werden nur + // angenommen, wenn der Task sie sich selbst schickt + current_thread = new_thread = + list_get_element_at(intr_handling_task[intr][i]->threads, 0); + + if (!fastrpc_irq(intr_handling_task[intr][i], 0, 0, + sizeof(intr), (char*) &intr, intr - IM_IRQ_BASE)) + { + break; + } + intr_to_send[intr][i]--; + } - if (!fastrpc_irq(intr_handling_task[intr], 0, 0, - sizeof(intr), (char*) &intr, intr - IM_IRQ_BASE)) - { - break; + if (intr_to_send[intr][i]) { + any_intr[intr] = true; } - intr_to_send[intr]--; } } -- 1.7.1 From max at tyndur.org Sat Jan 29 13:38:35 2011 From: max at tyndur.org (max at tyndur.org) Date: Sat, 29 Jan 2011 13:38:35 +0100 Subject: [tyndur-devel] [PATCH 2/5] CDI/pci: Ressourcenindex In-Reply-To: <1296304718-8845-1-git-send-email-max@tyndur.org> References: <1296304718-8845-1-git-send-email-max@tyndur.org> Message-ID: <1296304718-8845-3-git-send-email-max@tyndur.org> From: Max Reitz ! Der Index einer Ressource entspricht dem Index ihres BARs, IRQs sind deshalb nicht in die Ermittlung dieses Indexes einzubeziehen. Signed-off-by: Max Reitz --- src/modules/cdi/lib/pci.c | 3 +-- src/modules/include/pci.h | 2 ++ src/modules/pci/pciscan.c | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/cdi/lib/pci.c b/src/modules/cdi/lib/pci.c index 9b37da8..542fa79 100644 --- a/src/modules/cdi/lib/pci.c +++ b/src/modules/cdi/lib/pci.c @@ -60,7 +60,6 @@ static struct cdi_pci_device* read_pci_device(uint8_t* data, size_t size) // Ressourcen hinzufuegen struct pci_resource res; struct cdi_pci_resource* cdi_res; - int index = 0; size -= sizeof(*device); data += sizeof(*device); @@ -73,7 +72,7 @@ static struct cdi_pci_device* read_pci_device(uint8_t* data, size_t size) cdi_res = malloc(sizeof(*cdi_res)); cdi_res->start = res.start; cdi_res->length = res.length; - cdi_res->index = index++; + cdi_res->index = res.index; cdi_res->address = 0; switch (res.type) { diff --git a/src/modules/include/pci.h b/src/modules/include/pci.h index fdab461..043ce07 100644 --- a/src/modules/include/pci.h +++ b/src/modules/include/pci.h @@ -60,6 +60,8 @@ struct pci_resource { uint32_t type; uint32_t start; uint32_t length; + + int index; } __attribute__ ((packed)); diff --git a/src/modules/pci/pciscan.c b/src/modules/pci/pciscan.c index 08ec88a..fc76226 100644 --- a/src/modules/pci/pciscan.c +++ b/src/modules/pci/pciscan.c @@ -87,6 +87,8 @@ static void add_device(uint32_t bus, uint32_t device, uint32_t func) struct pci_resource* resource = malloc(sizeof(struct pci_resource)); + resource->index = bar_number; + switch(bar->type) { case bar_mem: resource->type = PCI_RESOURCE_MEM; @@ -121,6 +123,8 @@ static void add_device(uint32_t bus, uint32_t device, uint32_t func) resource->start = pci_device.irq; resource->length = 0; + resource->index = -1; + if (element->resources == NULL) { element->resources = list_create(); } -- 1.7.1 From max at tyndur.org Sat Jan 29 13:38:36 2011 From: max at tyndur.org (max at tyndur.org) Date: Sat, 29 Jan 2011 13:38:36 +0100 Subject: [tyndur-devel] [PATCH 3/5] CDI/audio In-Reply-To: <1296304718-8845-1-git-send-email-max@tyndur.org> References: <1296304718-8845-1-git-send-email-max@tyndur.org> Message-ID: <1296304718-8845-4-git-send-email-max@tyndur.org> From: Max Reitz + Header für CDI.audio hinzugefügt und Interface für die grundlegendsten Funktionen implementiert. Signed-off-by: Max Reitz --- src/modules/cdi/include/cdi/audio.h | 419 +++++++++++++++++++++++++++++++++++ src/modules/cdi/lib/audio.c | 342 ++++++++++++++++++++++++++++ src/modules/cdi/lib/cdi.c | 7 + 3 files changed, 768 insertions(+), 0 deletions(-) create mode 100644 src/modules/cdi/include/cdi/audio.h create mode 100644 src/modules/cdi/lib/audio.c diff --git a/src/modules/cdi/include/cdi/audio.h b/src/modules/cdi/include/cdi/audio.h new file mode 100644 index 0000000..c12d5d0 --- /dev/null +++ b/src/modules/cdi/include/cdi/audio.h @@ -0,0 +1,419 @@ +/* + * Copyright (c) 2010 Max Reitz + * + * This program is free software. It comes without any warranty, to + * the extent permitted by applicable law. You can redistribute it + * and/or modify it under the terms of the Do What The Fuck You Want + * To Public License, Version 2, as published by Sam Hocevar. See + * http://sam.zoy.org/projects/COPYING.WTFPL for more details. + */ + +/** + * \german + * Treiber für Soundkarten + * \endgerman + * \english + * Sound card drivers + * \endenglish + * \defgroup audio + */ +/*\@{*/ + +#ifndef _CDI_AUDIO_H_ +#define _CDI_AUDIO_H_ + +#include +#include + +#include "cdi.h" +#include "cdi/lists.h" +#include "cdi/mem.h" + +/** + * \german + * Mögliche Sampleformate (also Integer vorzeichenbehaftet/vorzeichenlos, + * Gleitkommazahlen, Größe eines Samples, ...). + * Wenn nicht anders gekennzeichnet, wird Little Endian verwendet. + * \endgerman + * \english + * Possible sample formats (i.e., signed/unsigned integer, floating point + * numbers, one sample's size, ...). + * Little endian is used, unless marked otherwise. + * \endenglish + */ +typedef enum { + // 16 bit signed integer + CDI_AUDIO_16SI = 0, + // 8 bit signed integer + CDI_AUDIO_8SI, + // 32 bit signed integer + CDI_AUDIO_32SI +} cdi_audio_sample_format_t; + +/** + * \german + * Abspielposition eines Kanals. Enthält den Index des aktuellen Puffers und + * des aktuell abgespielten Frames. + * \endgerman + * \english + * A stream's playback position. Contains the index of both the current buffer + * and the frame being played. + * \endenglish + */ +typedef struct cdi_audio_position { + size_t buffer; + size_t frame; +} cdi_audio_position_t; + +/** + * \german + * Status eines Kanals. + * \endgerman + * \english + * A stream's status. + * \endenglish + */ +typedef enum { + /** + * \german + * Angehalten + * \endgerman + * \english + * Stopped + * \endenglish + */ + CDI_AUDIO_STOP = 0, + /** + * \german + * Entweder abspielen oder aufnehmen, je nach Typ. + * \endgerman + * \english + * According to the device type either playing or recording. + * \endenglish + */ + CDI_AUDIO_PLAY = 1 +} cdi_audio_status_t; + +/** + * \german + * Beschreibt ein CDI.audio-Gerät, also Tonabspiel- oder Aufnahmehardware. + * Bietet eine Soundkarte beide Funktionen an, so muss sie in zwei CDI.audio- + * Geräte aufgeteilt werden. + * \endgerman + * \english + * Describes a CDI.audio device, i.e. a playback or recording device. If a + * sound card provides both functions, the driver must register one CDI.audio + * device per function. + * \endenglish + */ +struct cdi_audio_device { + struct cdi_device dev; + + /** + * \german + * Ist dieser Wert ungleich 0, so handelt es sich um ein Aufnahmegerät, + * es kann nur gelesen werden. Ist er 0, dann können nur Töne abgespielt + * werden. + * \endgerman + * \english + * If this value is not 0, this device is a recording device, thus one can + * only read data. Otherwise, only play back is possible. + * \endenglish + */ + int record; + + /** + * \german + * Abspielgeräte können mehrere logische Kanäle anbieten, die vom Gerät + * zusammengemixt werden. Ist dem nicht der Fall oder handelt es sich um + * ein Aufnahmegerät, dann ist die Größe dieser Liste genau 1. Sie enthält + * Elemente des Typs struct cdi_audio_stream. + * \endgerman + * \english + * Play back devices may provide several logical streams which are mixed by + * the device. If this is either not true or it is a recording device, the + * list's size is exactly 1. It contains elements of type + * struct cdi_audio_stream. + * \endenglish + */ + cdi_list_t streams; +}; + +/** + * \german + * Beschreibt einen Kanal eines CDI.audio-Geräts. + * Jeder Kanal besteht aus einer Reihe von Puffern mit abzuspielenden Samples, + * die hintereinander und in einer Schleife abgespielt werden. + * \endgerman + * \english + * Describes a CDI.audio device's stream. + * Each stream consists of a set of buffers containing samples being played + * consecutively and as a loop. + * \endenglish + */ +struct cdi_audio_stream { + /** + * \german + * Gerät, zu dem dieser Kanal gehört. + * \endgerman + * \english + * Device to which this stream belongs. + * \endenglish + */ + struct cdi_audio_device* device; + + /** + * \german + * Gibt die Anzahl der verfügbaren Datenpuffer an. + * \endgerman + * \english + * Contains the number of available data buffers. + * \endenglish + */ + size_t num_buffers; + + /** + * \german + * Gibt die Anzahl von Samples pro Datenpuffer an. + * \endgerman + * \english + * Contains the number of samples per buffer. + * \endenglish + */ + size_t buffer_size; + + /** + * \german + * Bei 0 kann die Samplerate eingestellt werden. Ansonsten kann sie nicht + * verändert werden und hat einen festen (hier angegebenen) Wert (in Hz). + * \endgerman + * \english + * If 0, the sample rate is adjustable. Otherwise, it isn't and is set to + * a fixed value in Hz (which is given here). + * \endenglish + */ + int fixed_sample_rate; + + /** + * \german + * Format der Samples in den Puffern. + * \endgerman + * \english + * Format of the samples contained in the buffers. + * \endenglish + */ + cdi_audio_sample_format_t sample_format; +}; + +struct cdi_audio_driver { + struct cdi_driver drv; + + /** + * \german + * + * Überträgt Daten von oder zu einem Puffer eines Geräts (bei + * Aufnahmegeräten wird empfangen, sonst gesendet). Es werden so viele + * Bytes übertragen, wie in den Puffer passen (abhängig von Sampleformat und + * Anzahl der Samples pro Puffer). + * + * @param stream Kanal, der angesprochen werden soll. + * @param buffer Der dort zu verwendende Puffer. + * @param memory Speicher, mit dem die Daten ausgetauscht werden sollen. + * @param offset Offset im Puffer (in Samples), an den die Daten kopiert + * werden (es wird nur so viel kopiert, bis das Ende des + * Puffers erreicht wird), wird bei Aufnahmegeräten ignoriert. + * + * @return 0 bei Erfolg, -1 im Fehlerfall. + * + * \endgerman + * \english + * + * Sends or receives data to/from a device's buffer (receives from recording + * devices, sends otherwise). The amount of data transmitted equals the + * buffer's size (depends on the sample format and the number of samples per + * buffer) reduced by the offset. + * + * @param stream Stream to be used. + * @param buffer Buffer to be used. + * @param memory Memory buffer being either source or destination. + * @param offset The content from memory is copied to the buffer respecting + * this offset (in samples) in the buffer. Thus, the data is + * copied to this offset until the end of the buffer has been + * reached (recording devices ignore this). + * + * @return 0 on success, -1 on error. + * + * \endenglish + */ + int (*transfer_data)(struct cdi_audio_stream* stream, size_t buffer, + struct cdi_mem_area* memory, size_t offset); + + /** + * \german + * + * Hält ein CDI.audio-Gerät an oder lässt es aufnehmen bzw. abspielen. Wird + * es angehalten, so wird die Position automatisch auf den Anfang des ersten + * Puffers gesetzt. + * + * @param device Das Gerät + * @param status Zu setzender Status. + * + * @return Tatsächlicher neuer Status. + * + * \endgerman + * \english + * + * Stops a CDI.audio device or makes it record or play, respectively. If it + * is stopped, its position is automatically set to the beginning of the + * first buffer. + * + * @param device The device + * @param status Status to be set. + * + * @return Actual new status. + * + * \endenglish + */ + cdi_audio_status_t (*change_device_status)(struct cdi_audio_device* device, + cdi_audio_status_t status); + + /** + * \german + * + * Setzt die Lautstärke eines Kanals. + * + * @param volume 0x00 ist stumm, 0xFF ist volle Lautstärke. + * + * \endgerman + * \english + * + * Sets a stream's volume. + * + * @param volume 0x00 is mute, 0xFF is full volume. + * + * \endenglish + */ + void (*set_volume)(struct cdi_audio_stream* stream, uint8_t volume); + + /** + * \german + * + * Verändert die Samplerate eines Kanals. + * + * @param stream Anzupassender Kanal. + * @param sample_rate Neue Samplerate, ist der Wert nichtpositiv, dann wird + * die aktuelle Samplerate nicht verändert. + * + * @return Gibt die tatsächliche neue Samplerate zurück (kann vom Parameter + * abweichen und wird es bei nichtpositivem auch). + * + * \endgerman + * \english + * + * Changes a stream's sample rate. + * + * @param stream Stream to be adjusted. + * @param sample_rate New sample rate, if nonpositive, the current sample + * rate won't be changed. + * + * @return Returns the actual new sample rate (may differ from the parameter + * and will, if the latter was nonpositive). + * + * \endenglish + */ + int (*set_sample_rate)(struct cdi_audio_stream* stream, int sample_rate); + + /** + * \german + * + * Gibt die aktuelle Abspiel-/Aufnahmeposition des Kanals zurück. + * + * @param stream Abzufragender Kanal. + * @param position Zeiger zu einer Struktur, die den Index des aktuellen + * Puffers und des derzeit abgespielten Frames empfängt. + * + * \endgerman + * \english + * + * Returns the stream's current playback/recording position. + * + * @param stream Stream to be queried. + * @param position Pointer to a structure receiving the index of both the + * current buffer and the frame played right now. + * + * \endenglish + */ + void (*get_position)(struct cdi_audio_stream* stream, + cdi_audio_position_t* position); + + /** + * \german + * + * Verändert die Anzahl der von einem CDI.audio-Gerät verwendeten Channel + * (da dies die Größe der Frames verändert, kann auch die Anzahl der + * tatsächlich verwendeten Samples in einem Puffer verändert werden: + * Beträgt diese Maximalzahl z. B. 0xFFFF, dann können bei zwei Channeln + * nur 0xFFFE Samples verwendet werden (da es keine halben Frames gibt)). + * + * @param dev CDI.audio-Gerät + * @param channels Anzahl der zu verwendenden Channels (bei ungültigem Wert + * wird am Gerät nichts verändert). + * + * @return Jetzt tatsächlich benutzte Channelanzahl. + * + * \endgerman + * \english + * + * Changes the number of channels used by a CDI.audio device (this changes + * the frames' size, hence the number of actually used samples per buffer + * may be changed, too: If this size equals e.g. 0xFFFF, only 0xFFFE samples + * are used when working with two channels (because there is no half of a + * frame)). + * + * @param dev CDI.audio device + * @param channels Number of channels to be used (if invalid, nothing will + * be changed). + * + * @return Actually used number of channels now. + * + * \endenglish + */ + int (*set_number_of_channels)(struct cdi_audio_device* dev, int channels); +}; + + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \german + * + * Wird vom Treiber aufgerufen, wenn die Bearbeitung eines Puffers abgeschlossen + * wurde (komplett abgespielt oder aufgenommen). Darf auch aus einer ISR heraus + * aufgerufen werden. + * + * @param stream Kanal, den es betrifft. + * @param buffer Pufferindex, der bearbeitet wurde. + * + * \endgerman + * \english + * + * Is called by a driver when having completed a buffer (i.e., completely played + * or recorded). May be called by an ISR. + * + * @param stream Stream being concerned. + * @param buffer Index of the completed buffer. + * + * \endenglish + */ +void cdi_audio_buffer_completed(struct cdi_audio_stream* stream, size_t buffer); + +#ifdef __cplusplus +}; // extern "C" +#endif + +#endif + +/*\@}*/ + diff --git a/src/modules/cdi/lib/audio.c b/src/modules/cdi/lib/audio.c new file mode 100644 index 0000000..7618c42 --- /dev/null +++ b/src/modules/cdi/lib/audio.c @@ -0,0 +1,342 @@ +/* + * Copyright (c) 2010 Max Reitz + * + * This program is free software. It comes without any warranty, to + * the extent permitted by applicable law. You can redistribute it + * and/or modify it under the terms of the Do What The Fuck You Want + * To Public License, Version 2, as published by Sam Hocevar. See + * http://sam.zoy.org/projects/COPYING.WTFPL for more details. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "cdi.h" +#include "cdi/audio.h" +#include "cdi/lists.h" +#include "cdi/mem.h" + +static pid_t current_mixer = 0; +static struct cdi_audio_driver* adriver = NULL; + +#define RPC(name) \ + static void name(pid_t src, uint32_t corr_id, size_t length, void* data) + +#define rpc_int_resp(val) rpc_send_int_response(src, corr_id, val) + +static size_t sample_size[] = { + 2, // CDI_AUDIO_16SI + 1, // CDI_AUDIO_8SI + 4 // CDI_AUDIO_32SI +}; + +RPC(register_mixer); +RPC(number_of_devices); +RPC(is_playback_device); +RPC(change_device_status); +RPC(transfer_data); +RPC(stream_info); +RPC(set_sample_rate); +RPC(set_number_of_channels); +RPC(get_current_frame); + +void cdi_audio_driver_register(struct cdi_audio_driver* driver) +{ + if (adriver != NULL) { + return; + } + + adriver = driver; + + // Die Registrierung bei init machen schon andere Teile der CDI-Lib + + register_message_handler("REG", ®ister_mixer); + register_message_handler("NUMODEV", &number_of_devices); + register_message_handler("ISPLYBK", &is_playback_device); + register_message_handler("CHGSTAT", &change_device_status); + register_message_handler("TFRDATA", &transfer_data); + register_message_handler("STRINFO", &stream_info); + register_message_handler("SSPRATE", &set_sample_rate); + register_message_handler("SETCHAN", &set_number_of_channels); + register_message_handler("GTFRAME", &get_current_frame); +} + +/** + * Ein Mixer registriert sich bei diesem Treiber oder meldet sich ab. + */ +RPC(register_mixer) +{ + // Es kann immer nur ein Mixer einen Treiber ansteuern + if ((length != sizeof(int)) || (current_mixer && (current_mixer != src))) { + rpc_int_resp(0); + return; + } + + if (current_mixer) { + if (!*(int*) data) { + // Mixer abmelden + current_mixer = 0; + rpc_int_resp(1); + } else { + // Anmeldung bereits erfolgt, noch mal geht nicht + rpc_int_resp(0); + } + return; + } else if (*(int*) data != 1) { + // Anmeldung noch nicht erfolgt, Abmeldung geht daher nicht + rpc_int_resp(0); + return; + } + + // Mixer anmelden + current_mixer = src; + rpc_int_resp(1); +} + +/** + * Gibt die Anzahl der verfügbaren Soundkarten zurück + */ +RPC(number_of_devices) +{ + if (src != current_mixer) { + rpc_int_resp(0); + } else { + rpc_int_resp(cdi_list_size(adriver->drv.devices)); + } +} + +/** + * Gibt 1 zurück, wenn der angegebene Index für ein Abspielgerät steht, bei + * einem Aufnahmegerät wird 0 und im Fehlerfall -1 zurückgegeben. + */ +RPC(is_playback_device) +{ + if ((src != current_mixer) || (length < sizeof(int))) { + rpc_int_resp(-1); + return; + } + + struct cdi_audio_device* dev = + cdi_list_get(adriver->drv.devices, ((int*) data)[0]); + + rpc_int_resp(!dev->record); +} + +/** + * Verändert den Zustand des Geräts. + */ +RPC(change_device_status) +{ + if ((src != current_mixer) || (length < 2 * sizeof(int))) { + rpc_int_resp(0); + return; + } + + struct cdi_audio_device* dev = + cdi_list_get(adriver->drv.devices, ((int*) data)[0]); + + if (dev == NULL) { + rpc_int_resp(0); + return; + } + + rpc_int_resp(adriver->change_device_status(dev, ((int*) data)[1])); +} + +/** + * Überträgt Daten von oder zu einem Stream (per SHM). + */ +RPC(transfer_data) +{ + struct { + int card, stream, buffer; + size_t offset, shm_size; + uint32_t shm; + } __attribute__((packed))* tfrd = data; + + if ((src != current_mixer) || (length < sizeof(*tfrd))) { + rpc_int_resp(0); + return; + } + + struct cdi_audio_device* dev = + cdi_list_get(adriver->drv.devices, tfrd->card); + + if (dev == NULL) { + rpc_int_resp(0); + return; + } + + struct cdi_audio_stream* str = + cdi_list_get(dev->streams, tfrd->stream); + + if (str == NULL) { + rpc_int_resp(0); + return; + } + + size_t ssize; + + switch (str->sample_format) { + case CDI_AUDIO_8SI: + case CDI_AUDIO_16SI: + case CDI_AUDIO_32SI: + ssize = sample_size[str->sample_format]; + break; + default: + rpc_int_resp(0); + return; + } + + size_t size = + (str->buffer_size - (dev->record ? 0 : tfrd->offset)) * ssize; + + // Größe des SHM ist nicht ausreichend + if (tfrd->shm_size < size) { + rpc_int_resp(0); + return; + } + + void* shm = open_shared_memory(tfrd->shm); + + // CDI-mem-area-Struktur erstellen, mit der der Treiber dann arbeitet + struct cdi_mem_area* buffer = calloc(1, sizeof(*buffer)); + buffer->vaddr = shm; + buffer->size = size; + + int ret = adriver->transfer_data(str, tfrd->buffer, buffer, tfrd->offset); + + free(buffer); + + close_shared_memory(tfrd->shm); + + rpc_int_resp(!ret); +} + +/** + * Gibt Informationen über einen Stream zurück (also die cdi_audio_stream- + * Struktur). + */ +RPC(stream_info) +{ + char dummy = 0; + + if ((src != current_mixer) || (length < 2 * sizeof(int))) { + rpc_send_response(src, corr_id, 1, &dummy); + return; + } + + struct cdi_audio_device* dev = + cdi_list_get(adriver->drv.devices, ((int*) data)[0]); + + if (dev == NULL) { + rpc_send_response(src, corr_id, 1, &dummy); + return; + } + + struct cdi_audio_stream* str = cdi_list_get(dev->streams, ((int*) data)[1]); + + if (str == NULL) { + rpc_send_response(src, corr_id, 1, &dummy); + return; + } + + rpc_send_response(src, corr_id, sizeof(*str), (char*) str); +} + +/** + * Setzt die Samplerate eines Streams. + */ +RPC(set_sample_rate) +{ + if ((src != current_mixer) || (length < 3 * sizeof(int))) { + rpc_int_resp(0); + return; + } + + struct cdi_audio_device* dev = + cdi_list_get(adriver->drv.devices, ((int*) data)[0]); + + if (dev == NULL) { + rpc_int_resp(0); + return; + } + + struct cdi_audio_stream* str = cdi_list_get(dev->streams, ((int*) data)[1]); + + if (str == NULL) { + rpc_int_resp(0); + return; + } + + rpc_int_resp(adriver->set_sample_rate(str, ((int*) data)[2])); +} + +/** + * Legt die Anzahl der Channels einer Soundkarte fest. + */ +RPC(set_number_of_channels) +{ + if ((src != current_mixer) || (length < 2 * sizeof(int))) { + rpc_int_resp(0); + return; + } + + struct cdi_audio_device* dev = + cdi_list_get(adriver->drv.devices, ((int*) data)[0]); + + if (dev == NULL) { + rpc_int_resp(0); + return; + } + + rpc_int_resp(adriver->set_number_of_channels(dev, ((int*) data)[1])); +} + +/** + * Gibt den Index des aktuell abgespielten Frames im aktuellen Puffer zurück. + */ +RPC(get_current_frame) +{ + if ((src != current_mixer) || (length < 2 * sizeof(int))) { + rpc_int_resp(0); + return; + } + + struct cdi_audio_device* dev = + cdi_list_get(adriver->drv.devices, ((int*) data)[0]); + + if (dev == NULL) { + rpc_int_resp(0); + return; + } + + struct cdi_audio_stream* str = cdi_list_get(dev->streams, ((int*) data)[1]); + + if (str == NULL) { + rpc_int_resp(0); + return; + } + + cdi_audio_position_t pos; + adriver->get_position(str, &pos); + + rpc_int_resp(pos.frame); +} + +/** + * Wird vom Soundkartentreiber aufgerufen, wenn die Bearbeitung eines Puffers + * abgeschlossen wurde. + */ +void cdi_audio_buffer_completed(struct cdi_audio_stream* stream, size_t buffer) +{ + if (current_mixer) { + rpc_get_int(current_mixer, "BUFCOM", sizeof(buffer), (char*) &buffer); + } +} + diff --git a/src/modules/cdi/lib/cdi.c b/src/modules/cdi/lib/cdi.c index 0d634d7..3502c2b 100644 --- a/src/modules/cdi/lib/cdi.c +++ b/src/modules/cdi/lib/cdi.c @@ -17,10 +17,13 @@ #include #include "cdi.h" +#include "cdi/audio.h" #include "cdi/fs.h" #include "cdi/pci.h" #include "cdi/storage.h" +extern void cdi_audio_driver_register(struct cdi_audio_driver* driver); + static list_t* drivers = NULL; static void cdi_tyndur_run_drivers(void); @@ -210,6 +213,10 @@ void cdi_driver_register(struct cdi_driver* driver) cdi_fs_driver_register((struct cdi_fs_driver*) driver); break; + case CDI_AUDIO: + cdi_audio_driver_register((struct cdi_audio_driver*) driver); + break; + default: break; } -- 1.7.1 From max at tyndur.org Sat Jan 29 13:38:37 2011 From: max at tyndur.org (max at tyndur.org) Date: Sat, 29 Jan 2011 13:38:37 +0100 Subject: [tyndur-devel] [PATCH 4/5] CDI/audio: ac97 In-Reply-To: <1296304718-8845-1-git-send-email-max@tyndur.org> References: <1296304718-8845-1-git-send-email-max@tyndur.org> Message-ID: <1296304718-8845-5-git-send-email-max@tyndur.org> From: Max Reitz + ac97-Treiber für CDI.audio implementiert, nicht auf echter Hardware getestet. Signed-off-by: Max Reitz --- src/modules/cdi/ac97/Makefile.all | 6 + src/modules/cdi/ac97/device.c | 311 +++++++++++++++++++++++++++++++++++++ src/modules/cdi/ac97/device.h | 115 ++++++++++++++ src/modules/cdi/ac97/main.c | 65 ++++++++ 4 files changed, 497 insertions(+), 0 deletions(-) create mode 100644 src/modules/cdi/ac97/Makefile.all create mode 100644 src/modules/cdi/ac97/device.c create mode 100644 src/modules/cdi/ac97/device.h create mode 100644 src/modules/cdi/ac97/main.c diff --git a/src/modules/cdi/ac97/Makefile.all b/src/modules/cdi/ac97/Makefile.all new file mode 100644 index 0000000..9e98010 --- /dev/null +++ b/src/modules/cdi/ac97/Makefile.all @@ -0,0 +1,6 @@ +shopt -s extglob +source $LOST_BUILDMK_ROOT/config.sh + +echo "LD $1/modules/ac97" +$LOST_TOOLS_LD -oac97.mod $LDSCRIPT *.o --start-group $2 --end-group +$LOST_TOOLS_STRIP -s ac97.mod -o $1/modules/ac97 diff --git a/src/modules/cdi/ac97/device.c b/src/modules/cdi/ac97/device.c new file mode 100644 index 0000000..b43d01c --- /dev/null +++ b/src/modules/cdi/ac97/device.c @@ -0,0 +1,311 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#include +#include +#include + +#include "cdi.h" +#include "cdi/audio.h" +#include "cdi/io.h" +#include "cdi/lists.h" +#include "cdi/mem.h" +#include "cdi/misc.h" +#include "cdi/pci.h" + +#include "device.h" + +#define SAMPLES_PER_BUFFER 0xFFFE + +static void ac97_isr(struct cdi_device* device); + +struct cdi_device* ac97_init_device(struct cdi_bus_data* bus_data) +{ + struct cdi_pci_device* pci = (struct cdi_pci_device*) bus_data; + + // Search for a usable device + if ((pci->vendor_id != 0x8086) || ((pci->device_id != 0x2415) && + (pci->device_id != 0x2425) && (pci->device_id != 0x2445))) + { + return NULL; + } + + struct ac97_device* dev = calloc(1, sizeof(*dev)); + + cdi_pci_alloc_ioports(pci); + + // Get the I/O resources (NAMBAR and NABMBAR) + struct cdi_pci_resource* res; + int i; + for (i = 0; (res = cdi_list_get(pci->resources, i)); i++) { + if (res->type == CDI_PCI_IOPORTS) { + if (!res->index) { + dev->nambar = res->start; + } else if (res->index == 1) { + dev->nabmbar = res->start; + } + } + } + + if (!dev->nambar || !dev->nabmbar) { + free(dev); + cdi_pci_free_ioports(pci); + return NULL; + } + + #ifdef CDI_PCI_DIRECT_ACCESS + // If possible, activate the I/O resources and the busmaster capability + cdi_pci_config_writew(pci, 4, cdi_pci_config_readw(pci, 4) | 5); + #endif + + struct ac97_card* ac97_card = malloc(sizeof(*ac97_card)); + struct ac97_stream* ac97_stream = malloc(sizeof(*ac97_stream)); + + // Define the CDI.audio sound card + ac97_card->card.record = 0; + ac97_card->card.streams = cdi_list_create(); + ac97_card->device = dev; + + // And the only stream + ac97_stream->stream.device = &ac97_card->card; + ac97_stream->stream.num_buffers = 32; + ac97_stream->stream.buffer_size = SAMPLES_PER_BUFFER; + ac97_stream->stream.sample_format = CDI_AUDIO_16SI; + + ac97_stream->device = dev; + + dev->output = &ac97_stream->stream; + + cdi_list_push(ac97_card->card.streams, ac97_stream); + + // Register the IRQ + cdi_register_irq(pci->irq, &ac97_isr, &ac97_card->card.dev); + + // Reset the card + cdi_outw(dev->nambar + NAM_RESET, 42); + + cdi_sleep_ms(100); + + // And still something... + cdi_outw(dev->nabmbar + NABM_PICONTROL, 0x02); + cdi_outw(dev->nabmbar + NABM_POCONTROL, 0x02); + cdi_outw(dev->nabmbar + NABM_MCCONTROL, 0x02); + + cdi_sleep_ms(100); + + // Set volume to 100 % + cdi_outw(dev->nambar + NAM_MASTER_VOLUME, 0x0000); + cdi_outw(dev->nambar + NAM_MONO_VOLUME, 0x00); + cdi_outw(dev->nambar + NAM_PC_BEEP, 0x00); + cdi_outw(dev->nambar + NAM_PCM_VOLUME, 0x0000); + + cdi_sleep_ms(10); + + // Test if sample rate is adjustable + if (!(cdi_inw(dev->nambar + NAM_EXT_AUDIO_ID) & 1)) { + // No it isn't; it's fixed to 48 kHz + ac97_stream->stream.fixed_sample_rate = 48000; + } else { + // Yes, it is + ac97_stream->stream.fixed_sample_rate = 0; + + // Use that capability (Variable Audio Rate) + cdi_outw(dev->nambar + NAM_EXT_AUDIO_STC, + cdi_inw(dev->nambar + NAM_EXT_AUDIO_STC) | 1); + + cdi_sleep_ms(10); + + // Set the sample rate to 44.1 kHz + cdi_outw(dev->nambar + NAM_FRONT_SPLRATE, 44100); + cdi_outw(dev->nambar + NAM_LR_SPLRATE, 44100); + } + + // TODO: Error handling + + // Allocate the buffer descriptor array + struct cdi_mem_area* bd = cdi_mem_alloc(32 * sizeof(dev->bd[0]), + 3 | CDI_MEM_DMA_4G | CDI_MEM_PHYS_CONTIGUOUS); + + dev->bd = bd->vaddr; + dev->vbd = calloc(32, sizeof(dev->vbd[0])); + + for (i = 0; i < 32; i++) + { + // Allocate each buffer + struct cdi_mem_area* buffer = cdi_mem_alloc(SAMPLES_PER_BUFFER * 4, + 12 | CDI_MEM_DMA_4G | CDI_MEM_PHYS_CONTIGUOUS); + + dev->bd[i].buffer = buffer->paddr.items->start; + dev->bd[i].length = SAMPLES_PER_BUFFER; + // Generate an IRQ on completion + dev->bd[i].flags = FLAG_IOC; + dev->vbd[i] = buffer->vaddr; + + // Zero the buffer + memset(buffer->vaddr, 0, SAMPLES_PER_BUFFER * 4); + } + + // Set the base address of the descriptor array + cdi_outl(dev->nabmbar + NABM_POBDBAR, bd->paddr.items->start); + + // Return the new device + return &ac97_card->card.dev; +} + +void ac97_remove_device(struct cdi_device* device) +{ + // TODO: Well... + (void) device; +} + +int ac97_transfer_data(struct cdi_audio_stream* stream, size_t buffer, + struct cdi_mem_area* memory, size_t offset) +{ + // Check if buffer index is valid + if (buffer >= 32) { + return -1; + } + + if (offset >= SAMPLES_PER_BUFFER) { + return -1; + } + + struct ac97_stream* s = (struct ac97_stream*) stream; + + // Copy the content to the AC97 buffer + memcpy((uint16_t*) s->device->vbd[buffer] + offset, memory->vaddr, + (SAMPLES_PER_BUFFER - offset) * 2); + + return 0; +} + +cdi_audio_status_t ac97_change_status(struct cdi_audio_device* device, + cdi_audio_status_t status) +{ + struct ac97_device* dev = ((struct ac97_card*) device)->device; + + if (status == CDI_AUDIO_PLAY) { + // Start playback + cdi_outb(dev->nabmbar + NABM_POCONTROL, 0x11); + // Set last valid buffer index to 31 + cdi_outb(dev->nabmbar + NABM_POLVI, 31); + } else if (status == CDI_AUDIO_STOP) { + // Stop playback + cdi_outb(dev->nabmbar + NABM_POCONTROL, 0x00); + } + + // Returns whether the card is active or not + return cdi_inb(dev->nabmbar + NABM_POCONTROL) & 0x1; +} + +void ac97_set_volume(struct cdi_audio_stream* stream, uint8_t volume) +{ + struct ac97_device* dev = ((struct ac97_stream*) stream)->device; + + // Calculate the AC97 volume (which is 63 - (volume * 63 / 255)) + int rvolume = volume * 63; + rvolume /= 255; + + rvolume = 63 - rvolume; + + // And set it + cdi_outw(dev->nambar + NAM_MASTER_VOLUME, (rvolume << 8) | rvolume); +} + +int ac97_set_sample_rate(struct cdi_audio_stream* stream, int sample_rate) +{ + struct ac97_device* dev = ((struct ac97_stream*) stream)->device; + + if (stream->fixed_sample_rate) { + // If the sample rate cannot be adjustet, return the fixed value + return stream->fixed_sample_rate; + } + + if (sample_rate > 0) { + // Try to set the requested sample rate + cdi_outw(dev->nambar + NAM_FRONT_SPLRATE, sample_rate); + cdi_outw(dev->nambar + NAM_LR_SPLRATE, sample_rate); + + cdi_sleep_ms(10); + } + + // And return the actual rate set + return cdi_inw(dev->nambar + NAM_FRONT_SPLRATE); +} + +void ac97_get_position(struct cdi_audio_stream* stream, + cdi_audio_position_t* position) +{ + struct ac97_device* dev = ((struct ac97_stream*) stream)->device; + + position->buffer = cdi_inb(dev->nabmbar + NABM_POCIV); + // POPICB contains the number of samples not yet read from the buffer, + // we are required to return the number of frames played + position->frame = + (SAMPLES_PER_BUFFER - cdi_inw(dev->nabmbar + NABM_POPICB)) / 2; +} + +int ac97_set_channel_count(struct cdi_audio_device* dev, int channels) +{ + (void) dev; + (void) channels; + + // TODO: Is that really fixed or is there any way to use e.g. mono? + return 2; +} + +static void ac97_isr(struct cdi_device* device) +{ + struct ac97_device* dev = ((struct ac97_card*) device)->device; + static int last_buf = 0; + + int pi = cdi_inb(dev->nabmbar + NABM_PISTATUS) & 0x1C; + int po = cdi_inb(dev->nabmbar + NABM_POSTATUS) & 0x1C; + int mc = cdi_inb(dev->nabmbar + NABM_MCSTATUS) & 0x1C; + + // Check if just anything happened + if (!pi && !po && !mc) { + return; + } + + // Tell the card we handled everything (no, we don't, but who cares). + cdi_outb(dev->nabmbar + NABM_PISTATUS, pi); + cdi_outb(dev->nabmbar + NABM_POSTATUS, po); + cdi_outb(dev->nabmbar + NABM_MCSTATUS, mc); + + if (po & (1 << 3)) { + int current = cdi_inb(dev->nabmbar + NABM_POCIV); + + if (current == last_buf) { + // This happens sometimes, though I don't know why (for the last + // buffer, i.e. buffer 30). This fix is at least enough for qemu. + current = (current + 1) & 0x1F; + cdi_outb(dev->nabmbar + NABM_POCONTROL, 0x11); + } + + last_buf = current; + + // Tell the CDI library about the finished buffer + cdi_audio_buffer_completed(dev->output, (current - 1) & 0x1F); + } +} + diff --git a/src/modules/cdi/ac97/device.h b/src/modules/cdi/ac97/device.h new file mode 100644 index 0000000..823f545 --- /dev/null +++ b/src/modules/cdi/ac97/device.h @@ -0,0 +1,115 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#ifndef DEVICE_H +#define DEVICE_H + +#include +#include + +#include "cdi.h" +#include "cdi/audio.h" +#include "cdi/mem.h" +#include "cdi/pci.h" + +// Some I/O port offsets +// NAMBAR +#define NAM_RESET 0x0000 +#define NAM_MASTER_VOLUME 0x0002 +#define NAM_MONO_VOLUME 0x0006 +#define NAM_PC_BEEP 0x000A +#define NAM_PCM_VOLUME 0x0018 +#define NAM_EXT_AUDIO_ID 0x0028 +#define NAM_EXT_AUDIO_STC 0x002A +#define NAM_FRONT_SPLRATE 0x002C +#define NAM_LR_SPLRATE 0x0032 +// NABMBAR +#define NABM_POBDBAR 0x0010 +#define NABM_POCIV 0x0014 +#define NABM_POLVI 0x0015 +#define NABM_PISTATUS 0x0006 +#define NABM_POSTATUS 0x0016 +#define NABM_MCSTATUS 0x0026 +#define NABM_POPICB 0x0018 +#define NABM_PICONTROL 0x000B +#define NABM_POCONTROL 0x001B +#define NABM_MCCONTROL 0x002B +#define NABM_GLB_STAT 0x0030 + +// Buffer flags which may be set +// Buffer underrun policy: If set, output 0 after the last sample, if there's no +// new buffer; else, output the last sample. +#define FLAG_BUP (1 << 14) +// Interrupt on completion: Request an interrupt when having completed the +// buffer +#define FLAG_IOC (1 << 15) + +// A descriptor describing a buffer +struct buf_desc +{ + // Physical address + uint32_t buffer; + // Number of samples contained + uint16_t length; + // Flags (BUP and/or IOC) + uint16_t flags; +} __attribute__((packed)); + +// A structure describing an AC97 card +struct ac97_device { + // The two I/O spaces + uint16_t nambar, nabmbar; + + // The buffer descriptor array + struct buf_desc* bd; + // The buffer's virtual addresses + void** vbd; + + // Pointer to the output stream + struct cdi_audio_stream* output; +}; + +struct ac97_stream { + struct cdi_audio_stream stream; + struct ac97_device* device; +}; + +struct ac97_card { + struct cdi_audio_device card; + struct ac97_device* device; +}; + +struct cdi_device* ac97_init_device(struct cdi_bus_data* bus_data); +void ac97_remove_device(struct cdi_device* device); + +int ac97_transfer_data(struct cdi_audio_stream* stream, size_t buffer, + struct cdi_mem_area* memory, size_t offset); +cdi_audio_status_t ac97_change_status(struct cdi_audio_device* device, + cdi_audio_status_t status); +void ac97_set_volume(struct cdi_audio_stream* stream, uint8_t volume); +int ac97_set_sample_rate(struct cdi_audio_stream* stream, int sample_rate); +void ac97_get_position(struct cdi_audio_stream* stream, + cdi_audio_position_t* position); +int ac97_set_channel_count(struct cdi_audio_device* dev, int channels); + +#endif + diff --git a/src/modules/cdi/ac97/main.c b/src/modules/cdi/ac97/main.c new file mode 100644 index 0000000..5afa557 --- /dev/null +++ b/src/modules/cdi/ac97/main.c @@ -0,0 +1,65 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#include "cdi/audio.h" + +#include "device.h" + +#define DRIVER_NAME "ac97" + +static struct cdi_audio_driver driver; + +static int ac97_driver_init(void) +{ + cdi_driver_init(&driver.drv); + + return 0; +} + +static int ac97_driver_destroy(void) +{ + cdi_driver_destroy(&driver.drv); + + return 0; +} + +static struct cdi_audio_driver driver = { + .drv = { + .name = DRIVER_NAME, + .type = CDI_AUDIO, + .bus = CDI_PCI, + .init = ac97_driver_init, + .destroy = ac97_driver_destroy, + .init_device = ac97_init_device, + .remove_device = ac97_remove_device + }, + + .transfer_data = ac97_transfer_data, + .change_device_status = ac97_change_status, + .set_volume = ac97_set_volume, + .set_sample_rate = ac97_set_sample_rate, + .get_position = ac97_get_position, + .set_number_of_channels = ac97_set_channel_count +}; + +CDI_DRIVER(DRIVER_NAME, driver) + -- 1.7.1 From max at tyndur.org Sat Jan 29 13:38:38 2011 From: max at tyndur.org (max at tyndur.org) Date: Sat, 29 Jan 2011 13:38:38 +0100 Subject: [tyndur-devel] [PATCH 5/5] Sound: Nichtmixer (Nixer) In-Reply-To: <1296304718-8845-1-git-send-email-max@tyndur.org> References: <1296304718-8845-1-git-send-email-max@tyndur.org> Message-ID: <1296304718-8845-6-git-send-email-max@tyndur.org> From: Max Reitz + Nixer implementiert, der von den Anwendungen aber wie ein normaler Mixer angesprochen wird (das Interface wird sich also nicht verändern, wenn der Nixer zum Mixer erweitert wird). Mit ihm werden die von den Programmen ausgegebenen PCM-Daten so umgewandelt, wie sie der Soundkartentreiber benötigt (Anpassung der Samplefrequenz fehlt bislang). Signed-off-by: Max Reitz --- src/modules/c/mixer/Makefile.all | 7 + src/modules/c/mixer/Makefile.conf | 1 + src/modules/c/mixer/adriver.c | 163 +++++++++++++++++++++ src/modules/c/mixer/input.c | 292 +++++++++++++++++++++++++++++++++++++ src/modules/c/mixer/input_queue.c | 91 ++++++++++++ src/modules/c/mixer/main.c | 116 +++++++++++++++ src/modules/c/mixer/manage.c | 184 +++++++++++++++++++++++ src/modules/c/mixer/nixer.h | 154 +++++++++++++++++++ 8 files changed, 1008 insertions(+), 0 deletions(-) create mode 100644 src/modules/c/mixer/Makefile.all create mode 100644 src/modules/c/mixer/Makefile.conf create mode 100644 src/modules/c/mixer/adriver.c create mode 100644 src/modules/c/mixer/input.c create mode 100644 src/modules/c/mixer/input_queue.c create mode 100644 src/modules/c/mixer/main.c create mode 100644 src/modules/c/mixer/manage.c create mode 100644 src/modules/c/mixer/nixer.h diff --git a/src/modules/c/mixer/Makefile.all b/src/modules/c/mixer/Makefile.all new file mode 100644 index 0000000..9075255 --- /dev/null +++ b/src/modules/c/mixer/Makefile.all @@ -0,0 +1,7 @@ +shopt -s extglob +source $LOST_BUILDMK_ROOT/config.sh + +echo "LD $1/apps/mixer" +$LOST_TOOLS_LD -omixer $LDSCRIPT *.o --start-group $2 --end-group + +mv mixer $1/apps/ diff --git a/src/modules/c/mixer/Makefile.conf b/src/modules/c/mixer/Makefile.conf new file mode 100644 index 0000000..db49762 --- /dev/null +++ b/src/modules/c/mixer/Makefile.conf @@ -0,0 +1 @@ +CC_FLAGS_APPEND="-I../../cdi/include" diff --git a/src/modules/c/mixer/adriver.c b/src/modules/c/mixer/adriver.c new file mode 100644 index 0000000..7d36aae --- /dev/null +++ b/src/modules/c/mixer/adriver.c @@ -0,0 +1,163 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include + +#include "nixer.h" + +// struct sim_adriver.device_count +static size_t sim_adriver_device_count(struct sim_adriver* drv) +{ + int dummy = 0; + return rpc_get_int(drv->pid, "NUMODEV", sizeof(dummy), (char*) &dummy); +} + +// struct sim_adriver.is_playback +static bool sim_adriver_is_playback(struct sim_adriver* drv, int index) +{ + return rpc_get_int(drv->pid, "ISPLYBK", sizeof(index), (char*) &index) == 1 + ? true : false; +} + +// struct sim_adriver.get_stream_information +static bool sim_adriver_get_stream_information(struct sim_adriver* drv, + int card) +{ + int strnum[2] = { card, 0 }; + + response_t* resp = rpc_get_response(drv->pid, "STRINFO", sizeof(strnum), + (char*) &strnum); + + if (resp->data_length != sizeof(*drv->str0)) { + free(resp->data); + free(resp); + return false; + } + + free(drv->str0); + drv->str0 = resp->data; + free(resp); + + return true; +} + +// struct sim_adriver.transfer_data +static bool sim_adriver_transfer_data(struct sim_adriver* drv, int card, + int stream, int buffer, size_t offset, uint32_t shm, size_t shm_size) +{ + struct tfrinfo tfrinfo = { + .card = card, + .stream = stream, + .buffer = buffer, + .offset = offset, + .shm_size = shm_size, + .shm = shm + }; + + return rpc_get_int(drv->pid, "TFRDATA", sizeof(tfrinfo), (char*) &tfrinfo) ? + true : false; +} + +// struct sim_adriver.change_device_status +static cdi_audio_status_t sim_adriver_change_device_status( + struct sim_adriver* drv, int card, cdi_audio_status_t status) +{ + int data[2] = { card, status }; + return rpc_get_int(drv->pid, "CHGSTAT", sizeof(data), (char*) &data); +} + +// struct sim_adriver.set_sample_rate +static int sim_adriver_set_sample_rate(struct sim_adriver* drv, int card, + int stream, int rate) +{ + int ssr[3] = { card, stream, rate }; + + return rpc_get_int(drv->pid, "SSPRATE", sizeof(ssr), (char*) &ssr); +} + +// struct sim_adriver.set_number_of_channels +static int sim_adriver_set_number_of_channels(struct sim_adriver* drv, int card, + int channels) +{ + int snoc[2] = { card, channels }; + + return rpc_get_int(drv->pid, "SETCHAN", sizeof(snoc), (char*) &snoc); +} + +// struct sim_adriver.get_current_frame +static int sim_adriver_get_current_frame(struct sim_adriver* drv, int card, + int stream) +{ + int gcf[2] = { card, stream }; + + return rpc_get_int(drv->pid, "GTFRAME", sizeof(gcf), (char*) &gcf); +} + +// struct sim_adriver.disconnect +static void sim_adriver_disconnect(struct sim_adriver* drv) +{ + int tmp = 0; + rpc_get_int(drv->pid, "REG", sizeof(tmp), (char*) &tmp); + free(drv); +} + +/** + * Sucht den Soundtreiber mit dem angegebenen Namen, wird er gefunden, dann + * meldet sich die Funktion beim Treiber an und gibt im Erfolgsfall eine + * Struktur zurück, die den Treiber repräsentiert. + */ +struct sim_adriver* find_driver(const char* name) +{ + pid_t pid = init_service_get((char*) name); + if (!pid) { + fprintf(stderr, "No such service \"%s\".\n", name); + return NULL; + } + + int tmp = 1; + if (rpc_get_int(pid, "REG", sizeof(tmp), (char*) &tmp) != 1) { + fprintf(stderr, "Could not register at \"%s\".\n", name); + return NULL; + } + + struct sim_adriver* ret = calloc(1, sizeof(*ret)); + + // Eintragen der PID und der Funktionszeiger + ret->pid = pid; + ret->device_count = &sim_adriver_device_count; + ret->is_playback = &sim_adriver_is_playback; + ret->get_stream_information = &sim_adriver_get_stream_information; + ret->transfer_data = &sim_adriver_transfer_data; + ret->change_device_status = &sim_adriver_change_device_status; + ret->set_sample_rate = &sim_adriver_set_sample_rate; + ret->set_number_of_channels = &sim_adriver_set_number_of_channels; + ret->get_current_frame = &sim_adriver_get_current_frame; + ret->disconnect = &sim_adriver_disconnect; + + return ret; +} diff --git a/src/modules/c/mixer/input.c b/src/modules/c/mixer/input.c new file mode 100644 index 0000000..2a0d800 --- /dev/null +++ b/src/modules/c/mixer/input.c @@ -0,0 +1,292 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#include +#include +#include +#include +#include +#include + +#include "nixer.h" + +extern struct sim_adriver* adriver; +extern struct input_queue* iq_start; + +extern int pbi; + +extern bool playing; +extern int buffers_queued; + +extern size_t shm_size; + +// Anzahl der Ausgabechannels +static int out_channel_count; + +// PID der aktuellen Quellanwendung +static pid_t current_source; +// Daten zum SHM in Richtung Anwendung +static uint32_t current_input_shm_id; +static size_t current_input_shm_size; +static void* current_input_shm; + +// Anzahl der Eingabechannels +static int input_channel_count; +// Eingabeformat +static cdi_audio_sample_format_t input_format; + +/** + * Wird von der Anwendung einerseits aufgerufen, um den Mixer zu konfigurieren + * und andererseits, um sich bei ihm anzumelden -- da dieser Mixer ein Nixer + * ist, kann immer nur eine Anwendung zu einem bestimmten Zeitpunkt bedient + * werden. + */ +RPC(mixer_config) +{ + struct mixer_config* mc = data; + + if (length != sizeof(*mc)) { + rpc_int_resp(0); + return; + } + + // Wenn schon eine Anwendung angemeldet ist, kann die Anfrage nicht + // akzeptiert werden + if (current_source && (src != current_source)) { + rpc_int_resp(0); + return; + } + + // Ist die Anzahl der Channels 0, dann meldet sich die Anwendung ab + if (current_source && !mc->channel_count) { + current_source = 0; + current_input_shm_size = 0; + current_input_shm = NULL; + close_shared_memory(current_input_shm_id); + + trash_sound(false); + + rpc_int_resp(1); + return; + } + + // Aktuelle Anwendung setzen + current_source = src; + + // Aktuelles Eingabeformat speichern + input_format = mc->sample_format; + input_channel_count = mc->channel_count; + + // TODO: Rückgabewert nutzen und bei Bedarf resamplen + adriver->set_sample_rate(adriver, pbi, 0, mc->sample_rate); + + // Versuchen, die Anzahl der Ausgabechannel der Anzahl der Eingabechannel + // anzupassen + out_channel_count = + adriver->set_number_of_channels(adriver, pbi, mc->channel_count); + + rpc_int_resp(1); +} + +/** + * Wird von der Anwendung aufgerufen, um einen SHM zur Übertragung von Daten zum + * Nixer zu erhalten. + */ +RPC(get_shm) +{ + if ((length != sizeof(size_t)) || (src != current_source)) { + rpc_dword_resp(0); + return; + } + + // Wenn es bereits einen SHM gibt, muss dieser zuerst geschlossen werden. + if (current_input_shm_id) { + current_input_shm = NULL; + close_shared_memory(current_input_shm_id); + } + + current_input_shm_size = *((size_t*) data); + + current_input_shm_id = create_shared_memory(current_input_shm_size); + if (current_input_shm_id) { + current_input_shm = open_shared_memory(current_input_shm_id); + } + + // SHM-ID zurückgeben + rpc_dword_resp(current_input_shm_id); +} + +/** + * Überträgt die Daten aus dem Eingangs-SHM in die Eingangsqueue und bereitet + * sie so auf das Abspielen durch den Soundtreiber vor. + */ +RPC(play_input) +{ + if ((src != current_source) || (length != sizeof(uint32_t))) { + rpc_int_resp(0); + return; + } + + // Kleine Kontrolle + if (*((uint32_t*) data) != current_input_shm_id) { + rpc_int_resp(0); + return; + } + + // Daten über das aktuell erstellte Eingangspaket + size_t current_size = 0, remaining = current_input_shm_size; + uint8_t* current_buffer; + struct input_queue* current_packet; + + uint8_t* input_buffer = current_input_shm; + + size_t input_size = sample_size[input_format]; + size_t output_size = sample_size[adriver->str0->sample_format]; + + // Gibt an, ob ein neues Paket erstellt wurde + bool allocated; + + // Nun werden die Daten vom Eingangsformat in das Ausgabeformat umgewandelt + while (remaining) { + if ((allocated = input_queue_complete())) { + // Letztes Paket vollständig, also erstellen wir ein neues + current_packet = malloc(sizeof(*current_packet)); + current_buffer = malloc(shm_size); + current_packet->buffer = current_buffer; + + current_size = shm_size; + } else { + // Letztes Paket unvollständig, also füllen wir das + current_packet = last_input_queue_packet(); + current_size = current_packet->missing; + + current_buffer = current_packet->buffer + + shm_size - current_packet->missing; + } + + // TODO: Müsste man bei mehr Sampleformaten anpassen (außer Signed + // Integer mit Little Endian) + int_fast32_t samples[(out_channel_count > input_channel_count) ? + out_channel_count : input_channel_count]; + size_t in_frame_size = input_channel_count * input_size; + size_t out_frame_size = out_channel_count * output_size; + + // Solange noch Eingabedaten vorhanden sind und der Ausgabepuffer nicht + // voll ist + // TODO: Das funktioniert, ist aber langsam. Mit MMX oder so kann man da + // bestimmt was machen. + while (current_size && remaining) { + int_fast32_t val = 0; + int i, j; + + // Eingabesamples einlesen + for (j = 0; j < input_channel_count; j++) { + val = 0; + for (i = 0; i < input_size; i++) { + val |= *(input_buffer++) << (i * 8); + } + + // Für die Ausgabe zurechtshiften + val <<= 8 * (4 - input_size); + val >>= 8 * (4 - output_size); + + samples[j] = val; + } + + remaining -= in_frame_size; + + // TODO: Das geht sicher besser + for (j = input_channel_count; j < out_channel_count; j++) { + samples[j] = val; + } + + // Ausgabesamples schreiben + for (j = 0; j < out_channel_count; j++) { + for (i = 0; i < output_size; i++) { + *(current_buffer++) = samples[j] & 0xFF; + samples[j] >>= 8; + } + } + + current_size -= out_frame_size; + } + + current_packet->missing = current_size; + if (allocated) { + // Wurde das Paket neu erstellt, dann muss es noch an die + // Eingangsqueue angehangen werden + input_queue_push(current_packet); + } + } + + // Abspielvorgang starten + play(); + + rpc_int_resp(1); +} + +/** + * Gibt die Anzahl der im Puffer vorhandenen Bytes zurück + */ +RPC(get_position) +{ + if (!playing && (iq_start == NULL)) { + rpc_int_resp(0); + return; + } + + int queued = 0; + + // FIXME: Warum auch immer, jedenfalls ist es schlecht, wenn diese Pakete + // mitgezählt werden und man mehr als einmal laut möchte + /* + // Berechnet, wie viele Bytes bei der Soundkarte warten + if (buffers_queued > 1) { + queued = (buffers_queued - 1) * shm_size; + } + */ + + // Untersucht, wie viele Bytes in der Eingangsqueue warten + struct input_queue* iq = iq_start; + + while (iq != NULL) { + queued += shm_size - iq->missing; + iq = iq->next; + } + + // Fragt ab, wie viele Bytes im aktuell in der Soundkarte abgespielten + // Puffer noch warten + if (playing && buffers_queued) { + queued += (adriver->str0->buffer_size - + adriver->get_current_frame(adriver, pbi, 0) * out_channel_count) * + sample_size[adriver->str0->sample_format]; + } + + // Die Größe des Ausgabe-SHMs abziehen, damit die Anwendung immer genügend + // Daten liefert, sodass der gefüllt werden kann. + queued -= shm_size; + if (queued < 0) { + queued = 0; + } + + rpc_int_resp(queued); +} diff --git a/src/modules/c/mixer/input_queue.c b/src/modules/c/mixer/input_queue.c new file mode 100644 index 0000000..e69205b --- /dev/null +++ b/src/modules/c/mixer/input_queue.c @@ -0,0 +1,91 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#include +#include +#include + +#include "nixer.h" + +// Anfang und Ende der Eingangsqueue +struct input_queue* iq_start; +struct input_queue** iq_end = &iq_start; + +/** + * Fügt ein Paket an das Ende der Eingangsqueue an + */ +void input_queue_push(struct input_queue* packet) +{ + packet->next = NULL; + + *iq_end = packet; + iq_end = &packet->next; +} + +/** + * Entfernt ein Paket vom Beginn der Eingangsqueue und gibt es zurück. + */ +struct input_queue* input_queue_pop(void) +{ + if (iq_start == NULL) { + return NULL; + } + + struct input_queue* packet = iq_start; + iq_start = packet->next; + + // Ende der Queue, somit wird iq_end ungültig und muss auf iq_start zeigen + if (packet->next == NULL) { + iq_end = &iq_start; + } + + return packet; +} + +/** + * Gibt einen Zeiger auf das letzte Paket in der Eingangsqueue zurück. + */ +struct input_queue* last_input_queue_packet(void) +{ + // Keine Pakete in der Queue + if (iq_end == &iq_start) { + return NULL; + } + + // Da iq_end ein Zeiger auf das next-Feld des letzten Pakets ist, kann man + // daraus die Adresse dieses Paketes ermitteln. + return (void*) ((uintptr_t) iq_end - offsetof(struct input_queue, next)); +} + +/** + * Ist der letzte Puffer in der Eingangsqeue vollständig gefüllt, so wird true + * zurückgegeben, ebenso, wenn die Queue leer ist, sonst false. + */ +bool input_queue_complete(void) +{ + struct input_queue* last_packet = last_input_queue_packet(); + if (last_packet == NULL) { + return true; + } + + return !last_packet->missing; +} diff --git a/src/modules/c/mixer/main.c b/src/modules/c/mixer/main.c new file mode 100644 index 0000000..d900a71 --- /dev/null +++ b/src/modules/c/mixer/main.c @@ -0,0 +1,116 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "nixer.h" + +// Daten zum SHM in Richtung Soundtreiber +uint32_t shm_id; +void* shm; +size_t shm_size; + +// Index der Ausgabesoundkarte +int pbi = -1; + +// Verwendeter Soundtreiber +struct sim_adriver* adriver; + +int main(int argc, char* argv[]) +{ + if (argc != 2) { + fprintf(stderr, "Usage: mixer \n"); + return 1; + } + + if ((adriver = find_driver(argv[1])) == NULL) { + fprintf(stderr, "No such service \"%s\".\n", argv[1]); + return 1; + } + + printf("Found service \"%s\" found and registered there.\n", argv[1]); + + int devnum = adriver->device_count(adriver); + + printf("Devices reported: %i\n", devnum); + + int i; + + for (i = 0; i < devnum; i++) { + if (adriver->is_playback(adriver, i)) { + pbi = i; + break; + } + } + + if (pbi == -1) { + adriver->disconnect(adriver); + fprintf(stderr, "No playback devices found.\n"); + return 1; + } + + printf("Device %i is a playback device.\n", pbi); + + if (adriver->get_stream_information(adriver, pbi) == false) { + adriver->disconnect(adriver); + fprintf(stderr, "Invalid answer.\n"); + return 1; + } + + switch (adriver->str0->sample_format) { + case CDI_AUDIO_8SI: + case CDI_AUDIO_16SI: + case CDI_AUDIO_32SI: + shm_size = adriver->str0->buffer_size * + sample_size[adriver->str0->sample_format]; + break; + default: + fprintf(stderr, "Unknown sample format %i.\n", + (int) adriver->str0->sample_format); + adriver->disconnect(adriver); + return 1; + } + + shm_id = create_shared_memory(shm_size); + shm = open_shared_memory(shm_id); + + adriver->change_device_status(adriver, pbi, CDI_AUDIO_STOP); + + init_service_register("mixer"); + + register_message_handler("BUFCOM", &buffer_completed); + register_message_handler("MIXCONF", &mixer_config); + register_message_handler("GETSHM", &get_shm); + register_message_handler("PLAY", &play_input); + register_message_handler("POS", &get_position); + + for (;;) { + wait_for_rpc(); + } +} diff --git a/src/modules/c/mixer/manage.c b/src/modules/c/mixer/manage.c new file mode 100644 index 0000000..16ec93f --- /dev/null +++ b/src/modules/c/mixer/manage.c @@ -0,0 +1,184 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#include +#include +#include +#include +#include + +#include + +#include "nixer.h" + +extern struct input_queue* iq_start; +extern struct input_queue** iq_end; +extern struct sim_adriver* adriver; + +extern int pbi; + +extern uint32_t shm_id; +extern void* shm; +extern size_t shm_size; + +// true, wenn derzeit Daten abgespielt werden +volatile bool playing; + +// Anzahl der bereits zum Soundkartentreiber geschickten Puffer (sollte +// mindestens zwei sein, damit keine Lücken beim Abspielen entstehen) +int buffers_queued; +// Nächster zu sendender Puffer +int current_buffer; + +/** + * Überträgt, wenn möglich, so viele Pakete aus der Eingangsqueue an den + * Treiber, bis dieser zwei Pakete zu bearbeiten hat (ein Paket wird + * aktuell bearbeitet, ein zweites dient als Puffer). + */ +void send_buffer(void) +{ + struct input_queue* ip; + + // Klasse, Queue leer oder erstes Paket unvollständig... + if ((iq_start == NULL) || (iq_start->missing)) { + if (!buffers_queued) { + adriver->change_device_status(adriver, pbi, CDI_AUDIO_STOP); + playing = false; + } + return; + } + + while (buffers_queued < 2) { + ip = input_queue_pop(); + + if ((ip == NULL) || (ip->missing)) { + break; + } + + // Die Daten im Paket besitzen bereits das Format, dass der Treiber + // erwartet + memcpy(shm, ip->buffer, shm_size); + + // Paket freigeben + free(ip->buffer); + free(ip); + + // Daten an den Treiber übergeben + if (!adriver->transfer_data(adriver, pbi, 0, current_buffer, 0, shm_id, + shm_size)) + { + fprintf(stderr, + "[nixer] Failed to transfer data (this is fatal).\n"); + adriver->disconnect(adriver); + abort(); + } + + buffers_queued++; + current_buffer = (current_buffer + 1) % adriver->str0->num_buffers; + } +} + +/** + * Startet den Abspielvorgang und überträgt die ersten Pakete an den Treiber. + */ +void play(void) +{ + bool has_played = playing; + + playing = true; + + send_buffer(); + + if (playing && !has_played) { + // Wiedergabe im Erfolgsfall starten + adriver->change_device_status(adriver, pbi, CDI_AUDIO_PLAY); + } +} + +/** + * Verwirft alle Eingabedaten und beendet den Abspielvorgang. + */ +void trash_sound(bool immediately) +{ + if (immediately) { + playing = false; + adriver->change_device_status(adriver, pbi, CDI_AUDIO_STOP); + buffers_queued = 0; + + struct input_queue* ip = iq_start; + iq_end = &iq_start; + iq_start = NULL; + + while (ip != NULL) { + free(ip->buffer); + + void* tmp = ip; + ip = ip->next; + free(tmp); + } + } + + while (playing); + + current_buffer = (current_buffer + 1) % adriver->str0->num_buffers; +} + +/** + * Wird vom Treiber aufgerufen, wenn ein Puffer abgeschlossen wurde. + */ +RPC(buffer_completed) +{ + if (length != sizeof(size_t)) { + rpc_int_resp(0); + return; + } + + // current_buffer sollte derzeit auf diesem Wert stehen + int expected = + (*(size_t*) data + buffers_queued) % adriver->str0->num_buffers; + + buffers_queued--; + + // Merkwürdigerweise wurden in diesem Fall mehr Puffer abgespielt, als + // eigentlich an die Karte übergeben wurden. + if (buffers_queued < 0) { + fprintf(stderr, "[nixer] Strange underrun; %i packets missing.\n", + -buffers_queued); + + // Versuch, zu retten, was zu retten ist + current_buffer = (*(size_t*) data + 1) % adriver->str0->num_buffers; + buffers_queued = 0; + } + + // current_buffer entspricht nicht dem Wert, den die Soundkarte erwartet + if (expected != current_buffer) { + fprintf(stderr, "[nixer] Buffer index discrepancy; %i expected, but " + "should be %i\n", current_buffer, expected); + + current_buffer = expected; + } + + // Nächsten Puffer aus der Eingabequeue senden + send_buffer(); + + rpc_int_resp(0); +} diff --git a/src/modules/c/mixer/nixer.h b/src/modules/c/mixer/nixer.h new file mode 100644 index 0000000..291ad14 --- /dev/null +++ b/src/modules/c/mixer/nixer.h @@ -0,0 +1,154 @@ +/****************************************************************************** + * Copyright (c) 2010 Max Reitz * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the "Software"), * + * to deal in the Software without restriction, including without limitation * + * the rights to use, copy, modify, merge, publish, distribute, sublicense, * + * and/or sell copies of the Software, and to permit persons to whom the * + * Software is furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * + * DEALINGS IN THE SOFTWARE. * + ******************************************************************************/ + +#ifndef NIXER_H +#define NIXER_H + +#include +#include +#include +#include +#include + +#include + +// Macros, damit man ein paar RPC-Sachen schneller schreiben kann +#define RPC(name) \ + void name(pid_t src, uint32_t corr_id, size_t length, void* data) + +#define rpc_int_resp(val) rpc_send_int_response(src, corr_id, val) +#define rpc_dword_resp(val) rpc_send_dword_response(src, corr_id, val) + +// Abstrahiert den aktuellen Ausgabetreiber +struct sim_adriver { + // PID des Treibers + pid_t pid; + + // Zu verwendender Stream (dieser Nichtmixer = Nixer unterstützt nur eine + // Quellanwendung, daher wäre die Verwendung mehrerer Ausgabestreams nicht + // sehr sinnvoll) + struct cdi_audio_stream* str0; + + /** + * Gibt die Anzahl der vom Treiber verwalteten Geräte zurück. + */ + size_t (*device_count)(struct sim_adriver* drv); + /** + * Gibt true zurück, wenn die Soundkarte mit dem angegebenen Index ein + * Ausgabegerät ist. + */ + bool (*is_playback)(struct sim_adriver* drv, int index); + /** + * Füllt das str0-Feld mit Informationen über den ersten Stream der + * ausgewählten Karte. + */ + bool (*get_stream_information)(struct sim_adriver* drv, int card); + /** + * Tauscht Daten mit dem Stream der angegebenen Karte aus (stream sollte + * normalerweise 0 sein), buffer ist der Index des zu verwendenden Puffers, + * offset der Zieloffset darin, shm die SHM-ID zum Datenaustausch und + * shm_size die Größe des SHMs. + * Bei Erfolg wird true zurückgegeben, sonst false. + */ + bool (*transfer_data)(struct sim_adriver* drv, int card, int stream, + int buffer, size_t offset, uint32_t shm, size_t shm_size); + /** + * Verändert den Zustand einer Soundkarte (z. B. Abspielen oder Anhalten). + * Zurückgegeben wird der tatsächlich gesetzte Zustand. + */ + cdi_audio_status_t (*change_device_status)(struct sim_adriver* drv, + int card, cdi_audio_status_t status); + /** + * Versucht, die Samplerate (in Hz) des angegebenen Streams zu verändern. + * Dies muss nicht immer gelingen, die tatsächlich eingestellte Samplerate + * wird zurückgegeben (z. B. könnte das Setzen der Samplerate 44101 Hz zu + * einer tatsächlichen Samplerate von 44100 Hz führen). + */ + int (*set_sample_rate)(struct sim_adriver* drv, int card, int stream, + int rate); + /** + * Versucht, die Anzahl der Ausgabechannel der angegebenen Karte zu setzen. + * Zurückgegeben wird die tatsächliche Anzahl von Channeln (Versucht man, + * eine Stereokarte mit der Channelanzahl 6 in den 5.1-Modus zu setzen, dann + * wird wohl 2 zurückgegeben, weil nur zwei Channel unterstützt werden). + */ + int (*set_number_of_channels)(struct sim_adriver* drv, int card, + int channels); + /** + * Gibt den Index des aktuell abgespielten Frames zurück. + */ + int (*get_current_frame)(struct sim_adriver* drv, int card, int stream); + /** + * Löst die Verbindung zu einem Audiotreiber und gibt den Speicher der + * übergebenen Struktur frei. + */ + void (*disconnect)(struct sim_adriver* drv); +}; + +// Struktur, die für transfer_data-RPC verwendet wird. +struct tfrinfo { + int card, stream, buffer; + size_t offset, shm_size; + uint32_t shm; +} __attribute__((packed)); + +// Struktur, die von der Anwendung genutzt wird, um dem Mixer Informationen +// zum Sampling mitzuteilen +struct mixer_config { + int sample_rate, channel_count; + cdi_audio_sample_format_t sample_format; +} __attribute__((packed)); + +// Queue mit den eingehenden Daten +struct input_queue { + struct input_queue* next; + // Puffer mit den an die Soundkarte zu schickenden Samples + void* buffer; + // Anzahl der noch fehlenden Bytes, bis der Puffer vollständig gefüllt ist + size_t missing; +} __attribute__((packed)); + +// Größe eines Samples in Abhängigkeit vom Sampleformat +static const size_t sample_size[] = { + 2, // CDI_AUDIO_16SI + 1, // CDI_AUDIO_8SI + 4 // CDI_AUDIO_32SI +}; + +void input_queue_push(struct input_queue* packet); +struct input_queue* input_queue_pop(void); +struct input_queue* last_input_queue_packet(void); +bool input_queue_complete(void); + +struct sim_adriver* find_driver(const char* name); + +void send_buffer(void); +void play(void); +void trash_sound(bool immediately); + +RPC(buffer_completed); +RPC(get_position); +RPC(get_shm); +RPC(mixer_config); +RPC(play_input); + +#endif -- 1.7.1 From max at tyndur.org Sun Jan 30 13:01:19 2011 From: max at tyndur.org (Max Reitz) Date: Sun, 30 Jan 2011 13:01:19 +0100 Subject: [tyndur-devel] [PATCH] Neue POSIX-Funktionen In-Reply-To: <201101301152.43251.arne.hasselbring@googlemail.com> References: <1296292818-4026-1-git-send-email-arne.hasselbring@googlemail.com> <4D43FA23.4080404@tyndur.org> <201101301152.43251.arne.hasselbring@googlemail.com> Message-ID: <4D45530F.40801@tyndur.org> Am 30.01.2011 11:52, schrieb Arne Hasselbring: >>> + } >>> + fclose(handle); >>> + return 0; >>> + } else { >>> + errno = EAGAIN; >>> + return -1; >>> >> Wieso ist es ein Fehler, wenn die Dateigröße auf die aktuelle Größe >> gesetzt werden soll (diff == 0)? >> > Das ist kein Fehler, sondern viel mehr wird das nie passieren. Siehe: > + int cur_len = ftell(handle); > + int diff = length - cur_len; > + if (diff == 0) { > + return 0; > + } > Schon dort wird ohne Fehler zurückgekehrt. Aber gcc fände das nicht in > Ordnung, glaube ich, dass am Ende nirgends was zurückgegeben wird. > Alternative: > if (diff > 0) { ... } > else if (diff < 0) { ... } > else { return 0; } > Also ich meine damit, dass man die if-Struktur umstellen müsste. > Oh, gar nicht gesehen, na dann. ^^ >> + if (diff < 0) { >> + char *data = malloc(cur_len); >> + fseek(handle, 0, SEEK_SET); >> + fread(data, cur_len, 1, handle); >> + char *buffer = malloc(length); >> + memcpy(buffer, data, length); >> + free(data); >> + fclose(handle); >> + handle = fopen(path, "w"); >> + fwrite(buffer, length, 1, handle); >> + free(buffer); >> + fclose(handle); >> + return 0; >> >> > Ich habe mich natürlich auch gefragt, ob das nicht schneller geht als erst die > ganze Datei einzulesen, auf eine bestimmte Länge zu kopieren, die Datei > komplett zu leeren und dann den verkürzten Inhalt wieder da rein zu schreiben. > Wenn LIOv2 so eine Funktion hat, ist das gut, aber zu Zeit ist mir keine > bessere Lösung eingefallen, schließlich ist dies ja gerade die Funktion, die > man aufruft, wenn man eine Datei verkürzen will (->Lowlevel, so sehe ich das > zumindest). > Es geht schon schneller, nur muss man dazu eben Funktionen des Dateisystemtreibers verwenden. Das meinte ich mit "auf LIOv1-Ebene implementieren". > >>> + } else if (diff > 0) { >>> + fseek(handle, 0, SEEK_END); >>> + int i; >>> + for (i = 0; i < diff; i++) { >>> + fprintf(handle, "%c", 0); >>> >>> >> fprintf ist hier wohl eher ein Overkill, fputc reicht doch, wobei >> es wohl noch besser wäre, wenn man ganze Speicherblöcke mit Nullen >> auf einmal schreibt. >> > Jetzt wo du's sagst, Speicherblöcke hätte ich natürlich nehmen können. > Wo ist denn der Unterschied zwischen fprintf und fputc? Sind doch sowieso nur > Front-Ends, glaube ich. > Das mag sein, aber ein fprintf rechnet normalerweise nicht damit, dass man nur ein einziges Zeichen ausgeben will. Das ist dafür ausgelegt, einen langen Formatstring zu parsen, deshalb dauert der Aufruf wohl um einiges länger als ein fputc-Aufruf. > Fazit von meiner Seite: Natürlich ist die Funktion nicht optimal, > wahrscheinlich ist sie sogar vom Design her schlecht, aber sie hat > funktioniert und das war für mich ausschlaggebend. > OK. Ich hoffe, du bist mir nicht böse, dass ich das dennoch ob meiner Bedenken nicht acke. ;-) From kevin at tyndur.org Sun Jan 30 15:07:09 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sun, 30 Jan 2011 15:07:09 +0100 Subject: [tyndur-devel] [PATCH] Neue POSIX-Funktionen In-Reply-To: <1296292818-4026-1-git-send-email-arne.hasselbring@googlemail.com> References: <1296292818-4026-1-git-send-email-arne.hasselbring@googlemail.com> Message-ID: <20110130140705.GA6126@silvanus> On Sat, Jan 29, 2011 at 10:20:18AM +0100, Arne Hasselbring wrote: > + truncate und ftruncate hinzugefügt libc: ... > > Signed-off-by: Arne Hasselbring > --- > src/modules/include/unistd.h | 6 +++ > src/modules/lib/posix/trunc.c | 88 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 94 insertions(+), 0 deletions(-) > create mode 100644 src/modules/lib/posix/trunc.c > > diff --git a/src/modules/include/unistd.h b/src/modules/include/unistd.h > index 3532f1a..db4e426 100644 > --- a/src/modules/include/unistd.h > +++ b/src/modules/include/unistd.h > @@ -125,6 +125,12 @@ long alarm(long seconds); > /// Gibt die Groesse einer Page zurueck > int getpagesize(void); > > +/// Datei auf eine bestimmte Länge setzen > +int truncate(const char *path, off_t length); > + > +/// Datei anhand des Deskriptors auf eine bestimmte Länge setzen > +int ftruncate(int fd, off_t length); > + > /** > * Einen symbolischen Link anlegen > * > diff --git a/src/modules/lib/posix/trunc.c b/src/modules/lib/posix/trunc.c > new file mode 100644 > index 0000000..df5e882 > --- /dev/null > +++ b/src/modules/lib/posix/trunc.c > @@ -0,0 +1,88 @@ > +#include > +#include > +#include > +#include > +#include > +#include > + > +int truncate(const char *path, off_t length) > +{ > + FILE *handle = fopen(path, "a+"); > + if (handle == NULL) { > + errno = ENOENT; > + return -1; > + } > + fseek(handle, 0, SEEK_END); > + int cur_len = ftell(handle); > + int diff = length - cur_len; > + if (diff == 0) { > + return 0; > + } > + if (diff < 0) { > + char *data = malloc(cur_len); > + fseek(handle, 0, SEEK_SET); > + fread(data, cur_len, 1, handle); > + char *buffer = malloc(length); > + memcpy(buffer, data, length); > + free(data); > + fclose(handle); > + handle = fopen(path, "w"); > + fwrite(buffer, length, 1, handle); > + free(buffer); > + fclose(handle); > + return 0; > + } else if (diff > 0) { > + fseek(handle, 0, SEEK_END); > + int i; > + for (i = 0; i < diff; i++) { > + fprintf(handle, "%c", 0); > + } > + fclose(handle); > + return 0; > + } else { > + errno = EAGAIN; > + return -1; > + } > +} truncate() sollte nicht den ftruncate-Code kopieren, sondern einfach ftruncate() aufrufen. > + > + > +int ftruncate(int fd, off_t length) > +{ > + FILE *handle = fdopen(fd, "a+"); > + if (handle == NULL) { > + errno = ENOENT; > + return -1; > + } > + fseek(handle, 0, SEEK_END); > + int cur_len = ftell(handle); > + int diff = length - cur_len; > + if (diff == 0) { > + return 0; > + } > + if (diff < 0) { > + char *data = malloc(cur_len); > + fseek(handle, 0, SEEK_SET); > + fread(data, cur_len, 1, handle); > + char *buffer = malloc(length); > + memcpy(buffer, data, length); > + free(data); > + fclose(handle); > + remove(handle->path); > + handle = fdopen(fd, "w"); Angenommen, hier gibt es einen Absturz (Stromausfall oder was auch immer). Jetzt sind die Daten futsch. Schade irgendwie. Über die restlichen Kaputtheiten hat Max ja schon gesprochen, das brauch ich nicht zu wiederholen. Und mit den Einrückungen scheint auch was nicht in Ordnung zu sein. Kevin From arne.hasselbring at googlemail.com Sun Jan 30 17:56:29 2011 From: arne.hasselbring at googlemail.com (Arne Hasselbring) Date: Sun, 30 Jan 2011 17:56:29 +0100 Subject: [tyndur-devel] [PATCH] grep: configure.patch Message-ID: <1296406589-2152-1-git-send-email-arne.hasselbring@googlemail.com> * Jetzt wird nicht mehr der host-system-type-Check entfernt, sondern tyndur als mögliches System hinzugefügt Signed-off-by: Arne Hasselbring --- lbuilds/grep/2.7/files/configure.patch | 47 +++++++------------------------- 1 files changed, 10 insertions(+), 37 deletions(-) diff --git a/lbuilds/grep/2.7/files/configure.patch b/lbuilds/grep/2.7/files/configure.patch index 4646bfb..86b0315 100644 --- a/lbuilds/grep/2.7/files/configure.patch +++ b/lbuilds/grep/2.7/files/configure.patch @@ -1,39 +1,12 @@ -Index: grep-2.7/configure +Index: grep-2.7/build-aux/config.sub =================================================================== ---- grep-2.7.orig/configure -+++ grep-2.7/configure -@@ -3668,35 +3668,4 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 --$as_echo_n "checking host system type... " >&6; } --if ${ac_cv_host+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "x$host_alias" = x; then -- ac_cv_host=$ac_cv_build --else -- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 --$as_echo "$ac_cv_host" >&6; } --case $ac_cv_host in --*-*-*) ;; --*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; --esac --host=$ac_cv_host --ac_save_IFS=$IFS; IFS='-' --set x $ac_cv_host --shift --host_cpu=$1 --host_vendor=$2 --shift; shift --# Remember, the first character of IFS is used to create $*, --# except with old shells: --host_os=$* --IFS=$ac_save_IFS --case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +--- grep-2.7.orig/build-aux/config.sub ++++ grep-2.7/build-aux/config.sub +@@ -1325,6 +1325,6 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tyndur*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; -- 1.7.1 From kevin at tyndur.org Mon Jan 31 23:08:10 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Mon, 31 Jan 2011 23:08:10 +0100 Subject: [tyndur-devel] [PATCH] lpt: Filter beim Auflisten In-Reply-To: <1295890762-1898-1-git-send-email-arne.hasselbring@googlemail.com> References: <1295890762-1898-1-git-send-email-arne.hasselbring@googlemail.com> Message-ID: <20110131220805.GA21000@silvanus> On Mon, Jan 24, 2011 at 06:39:22PM +0100, Arne Hasselbring wrote: > + Durch Eingabe von lpt list --filter [installed|notinstalled] werden nur > installierte bzw. nicht installierte Pakete angezeigt > --- > src/modules/pas/lpt/lpt.pas | 119 ++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 118 insertions(+), 1 deletions(-) Hm, kann man natürlich so machen, aber irgendwie tendierst du dazu, Code zu kopieren statt ihn wiederzuverwenden. Meine erste Idee wäre gewesen, ein TPackageSet.Filter einzubauen, das einen Funktionspointer function (pkgset: PPackageSet): boolean; nimmt und zurückgibt, ob ein Eintrag in der Menge bleiben soll oder nicht. Dann braucht du nämlich von dem ganzen Ausgabecode keine Kopien, sondern kannst ihn einfach mit dem jeweils richtigen TPackageSet füttern. > diff --git a/src/modules/pas/lpt/lpt.pas b/src/modules/pas/lpt/lpt.pas > index 5705d97..1ab91f8 100644 > --- a/src/modules/pas/lpt/lpt.pas > +++ b/src/modules/pas/lpt/lpt.pas > @@ -295,6 +295,111 @@ begin > end; > end; > > + > +procedure ListInstalled; > +var > + srec: SearchRec; srec sieht unbenutzt aus. > + pkgset: TPackageSet; > + pkg: TPackage; > + sect: TPackageSection; > + ver: TPackageVersion; > + dep: TDependency; > + > + repo: TRepository; > + > + i, j, k, l: integer; > + filename: String; > +begin > + ReadPkgsrc(getConfigRoot + 'pkgsrc'); > + pkgset := TPackageSet.create; > + ReadPkglists(pkgset); > + > + for i := 0 to pkgset.packages.count - 1 do begin > + pkg := TPackage(pkgset.packages.items[i]); > + for j := 0 to pkg.sections.count - 1 do begin > + sect := TPackageSection(pkg.sections.items[j]); > + for k := 0 to sect.versions.count - 1 do begin > + ver := TPackageVersion(sect.versions.items[k]); > + filename := 'file:/packages/' + ver.pkg.name + '/' + > + ver.version + '/' + ver.section.section + '/'; > + > + if FileExists(filename) then begin > + Write(pkg.name, StringOfChar(' ', 12 - Length(pkg.name))); > + Write(' | ', sect.section, StringOfChar(' ', 5 - Length(sect.section))); > + Write(' | ', ver.version : 10); > + if Length(pkg.desc) > 43 then begin > + WriteLn(' | ' + Copy(pkg.desc, 1, 40), '...'); > + end else begin > + WriteLn(' | ' + pkg.desc); > + end; > + > + for l := 0 to ver.preinstDependencies.count - 1 do begin > + dep := TDependency(ver.preinstDependencies.items[l]); > + WriteLn('' : 36, rsListInstallDependency, dep.pkgname + ' (' + dep.section + ')'); > + end; > + > + for l := 0 to ver.runDependencies.count - 1 do begin > + dep := TDependency(ver.runDependencies.items[l]); > + WriteLn('' : 36, rsListRunDependency, dep.pkgname + ' (' + dep.section + ')'); > + end; > + end; > + end; > + end; > + end; > +end; > + > + > +procedure ListNotInstalled; > +var > + srec: SearchRec; Hier auch. > + pkgset: TPackageSet; > + pkg: TPackage; > + sect: TPackageSection; > + ver: TPackageVersion; > + dep: TDependency; > + > + repo: TRepository; > + > + i, j, k, l: integer; > + filename: String; > +begin > + ReadPkgsrc(getConfigRoot + 'pkgsrc'); > + pkgset := TPackageSet.create; > + ReadPkglists(pkgset); > + > + for i := 0 to pkgset.packages.count - 1 do begin > + pkg := TPackage(pkgset.packages.items[i]); > + for j := 0 to pkg.sections.count - 1 do begin > + sect := TPackageSection(pkg.sections.items[j]); > + for k := 0 to sect.versions.count - 1 do begin > + ver := TPackageVersion(sect.versions.items[k]); > + filename := 'file:/packages/' + ver.pkg.name + '/' + > + ver.version + '/' + ver.section.section + '/'; > + if not FileExists(filename) then begin > + Write(pkg.name, StringOfChar(' ', 12 - Length(pkg.name))); > + Write(' | ', sect.section, StringOfChar(' ', 5 - Length(sect.section))); > + Write(' | ', ver.version : 10); > + if Length(pkg.desc) > 43 then begin > + WriteLn(' | ' + Copy(pkg.desc, 1, 40), '...'); > + end else begin > + WriteLn(' | ' + pkg.desc); > + end; > + > + for l := 0 to ver.preinstDependencies.count - 1 do begin > + dep := TDependency(ver.preinstDependencies.items[l]); > + WriteLn('' : 36, rsListInstallDependency, dep.pkgname + ' (' + dep.section + ')'); > + end; > + > + for l := 0 to ver.runDependencies.count - 1 do begin > + dep := TDependency(ver.runDependencies.items[l]); > + WriteLn('' : 36, rsListRunDependency, dep.pkgname + ' (' + dep.section + ')'); > + end; > + end; > + end; > + end; > + end; > +end; > + > function c_lostio_create_link(target, link: PChar; hard: boolean): integer; cdecl; external name 'io_create_link'; > > procedure CfgAddbin(path, pubname: String); > @@ -358,7 +463,19 @@ begin > if system.ParamStr(1) = 'scan' then begin > Scan; > end else if system.ParamStr(1) = 'list' then begin > - List; > + if system.ParamCount = 1 then begin > + List; > + end else if system.ParamCount = 3 then begin > + if system.ParamStr(2) = '--filter' then begin > + if system.ParamStr(3) = 'installed' then begin > + ListInstalled; > + end else if system.ParamStr(3) = 'notinstalled' then begin Vielleicht 'new' statt 'notinstalled'? > + ListNotInstalled; > + end; > + end; Da fehlen ein paar else-Zweige, die mich anmeckern, wenn ich 'lpt list --filter kaputt' oder 'lpt list foo bar' eingebe. > + end else begin > + WriteLn(rsWrongParamCount); > + end; > end else if system.ParamStr(1) = 'get' then begin > if system.ParamCount = 2 then begin > Get(system.ParamStr(2), false); > -- > 1.7.1 > > _______________________________________________ > tyndur-devel mailing list > tyndur-devel at tyndur.org > http://list.tyndur.org/mailman/listinfo/tyndur-devel From Christian.Klahn at Live.de Sat Jan 29 09:32:06 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:32:06 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06 Message-ID: + lbuild für Nasm 2.06 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06/files/build.patch | 69 +++++++++++++++++++++++++++++++++++ lbuilds/nasm/2.06/nasm-2.06.lbuild | 49 +++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06/files/build.patch create mode 100644 lbuilds/nasm/2.06/nasm-2.06.lbuild diff --git a/lbuilds/nasm/2.06/files/build.patch b/lbuilds/nasm/2.06/files/build.patch new file mode 100644 index 0000000..748f7bb --- /dev/null +++ b/lbuilds/nasm/2.06/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06/compiler.h +=================================================================== +--- src.orig/nasm-2.06/compiler.h ++++ src/nasm-2.06/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06/nasmlib.h ++++ src/nasm-2.06/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06/rdoff/rdfdump.c ++++ src/nasm-2.06/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06/rdoff/rdoff.c ++++ src/nasm-2.06/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06/nasm-2.06.lbuild b/lbuilds/nasm/2.06/nasm-2.06.lbuild new file mode 100644 index 0000000..6112c8f --- /dev/null +++ b/lbuilds/nasm/2.06/nasm-2.06.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------090105070602090406050807-- From Christian.Klahn at Live.de Fri Jan 28 23:49:46 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Fri, 28 Jan 2011 23:49:46 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc1 Message-ID: + lbuild für Nasm 2.06rc1 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc1/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc1/files/build.patch create mode 100644 lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild diff --git a/lbuilds/nasm/2.06rc1/files/build.patch b/lbuilds/nasm/2.06rc1/files/build.patch new file mode 100644 index 0000000..4a9c898 --- /dev/null +++ b/lbuilds/nasm/2.06rc1/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc1/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc1/compiler.h ++++ src/nasm-2.06rc1/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc1/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc1/nasmlib.h ++++ src/nasm-2.06rc1/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc1/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc1/rdoff/rdfdump.c ++++ src/nasm-2.06rc1/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc1/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc1/rdoff/rdoff.c ++++ src/nasm-2.06rc1/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild b/lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild new file mode 100644 index 0000000..ac62a29 --- /dev/null +++ b/lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc1/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------020500090803000506060701-- From Christian.Klahn at Live.de Sat Jan 29 00:11:00 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:11:00 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc3 Message-ID: + lbuild für Nasm 2.06rc3 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc3/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc3/files/build.patch create mode 100644 lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild diff --git a/lbuilds/nasm/2.06rc3/files/build.patch b/lbuilds/nasm/2.06rc3/files/build.patch new file mode 100644 index 0000000..9edb218 --- /dev/null +++ b/lbuilds/nasm/2.06rc3/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc3/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc3/compiler.h ++++ src/nasm-2.06rc3/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc3/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc3/nasmlib.h ++++ src/nasm-2.06rc3/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc3/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc3/rdoff/rdfdump.c ++++ src/nasm-2.06rc3/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc3/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc3/rdoff/rdoff.c ++++ src/nasm-2.06rc3/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild b/lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild new file mode 100644 index 0000000..b400528 --- /dev/null +++ b/lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc3/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------050607020406060808040704-- From Christian.Klahn at Live.de Sat Jan 29 00:12:36 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:12:36 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc4 Message-ID: + lbuild für Nasm 2.06rc4 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc4/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc4/files/build.patch create mode 100644 lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild diff --git a/lbuilds/nasm/2.06rc4/files/build.patch b/lbuilds/nasm/2.06rc4/files/build.patch new file mode 100644 index 0000000..731e51e --- /dev/null +++ b/lbuilds/nasm/2.06rc4/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc4/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc4/compiler.h ++++ src/nasm-2.06rc4/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc4/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc4/nasmlib.h ++++ src/nasm-2.06rc4/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc4/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc4/rdoff/rdfdump.c ++++ src/nasm-2.06rc4/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc4/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc4/rdoff/rdoff.c ++++ src/nasm-2.06rc4/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild b/lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild new file mode 100644 index 0000000..051091c --- /dev/null +++ b/lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc4/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------090706070804070606070908-- From Christian.Klahn at Live.de Sat Jan 29 00:13:28 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:13:28 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc5 Message-ID: + lbuild für Nasm 2.06rc5 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc5/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc5/files/build.patch create mode 100644 lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild diff --git a/lbuilds/nasm/2.06rc5/files/build.patch b/lbuilds/nasm/2.06rc5/files/build.patch new file mode 100644 index 0000000..e9bb71a --- /dev/null +++ b/lbuilds/nasm/2.06rc5/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc5/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc5/compiler.h ++++ src/nasm-2.06rc5/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc5/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc5/nasmlib.h ++++ src/nasm-2.06rc5/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc5/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc5/rdoff/rdfdump.c ++++ src/nasm-2.06rc5/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc5/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc5/rdoff/rdoff.c ++++ src/nasm-2.06rc5/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild b/lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild new file mode 100644 index 0000000..e67083c --- /dev/null +++ b/lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc5/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------000901050500050101000001-- From Christian.Klahn at Live.de Sat Jan 29 00:14:31 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:14:31 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc6 Message-ID: + lbuild für Nasm 2.06rc6 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc6/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc6/files/build.patch create mode 100644 lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild diff --git a/lbuilds/nasm/2.06rc6/files/build.patch b/lbuilds/nasm/2.06rc6/files/build.patch new file mode 100644 index 0000000..12f43b8 --- /dev/null +++ b/lbuilds/nasm/2.06rc6/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc6/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc6/compiler.h ++++ src/nasm-2.06rc6/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc6/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc6/nasmlib.h ++++ src/nasm-2.06rc6/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc6/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc6/rdoff/rdfdump.c ++++ src/nasm-2.06rc6/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc6/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc6/rdoff/rdoff.c ++++ src/nasm-2.06rc6/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild b/lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild new file mode 100644 index 0000000..f5d619a --- /dev/null +++ b/lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc6/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------030808000400020108010509-- From Christian.Klahn at Live.de Sat Jan 29 00:19:44 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:19:44 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc9 Message-ID: + lbuild für Nasm 2.06rc9 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc8/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc8/files/build.patch create mode 100644 lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild diff --git a/lbuilds/nasm/2.06rc8/files/build.patch b/lbuilds/nasm/2.06rc8/files/build.patch new file mode 100644 index 0000000..5fb48df --- /dev/null +++ b/lbuilds/nasm/2.06rc8/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc8/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc8/compiler.h ++++ src/nasm-2.06rc8/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc8/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc8/nasmlib.h ++++ src/nasm-2.06rc8/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc8/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc8/rdoff/rdfdump.c ++++ src/nasm-2.06rc8/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc8/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc8/rdoff/rdoff.c ++++ src/nasm-2.06rc8/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild b/lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild new file mode 100644 index 0000000..926723c --- /dev/null +++ b/lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc8/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------040903020009070109010409-- From Christian.Klahn at Live.de Sat Jan 29 09:33:16 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:33:16 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc10 Message-ID: + lbuild für Nasm 2.06rc10 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc10/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc10/files/build.patch create mode 100644 lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild diff --git a/lbuilds/nasm/2.06rc10/files/build.patch b/lbuilds/nasm/2.06rc10/files/build.patch new file mode 100644 index 0000000..3968684 --- /dev/null +++ b/lbuilds/nasm/2.06rc10/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc10/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc10/compiler.h ++++ src/nasm-2.06rc10/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc10/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc10/nasmlib.h ++++ src/nasm-2.06rc10/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc10/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc10/rdoff/rdfdump.c ++++ src/nasm-2.06rc10/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc10/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc10/rdoff/rdoff.c ++++ src/nasm-2.06rc10/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild b/lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild new file mode 100644 index 0000000..4e8c958 --- /dev/null +++ b/lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc10/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------050603000502060206050406-- From Christian.Klahn at Live.de Sat Jan 29 09:36:07 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:36:07 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc11 Message-ID: + lbuild für Nasm 2.06rc11 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc11/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc11/files/build.patch create mode 100644 lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild diff --git a/lbuilds/nasm/2.06rc11/files/build.patch b/lbuilds/nasm/2.06rc11/files/build.patch new file mode 100644 index 0000000..b85a921 --- /dev/null +++ b/lbuilds/nasm/2.06rc11/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc11/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc11/compiler.h ++++ src/nasm-2.06rc11/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc11/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc11/nasmlib.h ++++ src/nasm-2.06rc11/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc11/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc11/rdoff/rdfdump.c ++++ src/nasm-2.06rc11/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc11/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc11/rdoff/rdoff.c ++++ src/nasm-2.06rc11/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild b/lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild new file mode 100644 index 0000000..524d2d7 --- /dev/null +++ b/lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc11/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------050809080802030807050408-- From Christian.Klahn at Live.de Sat Jan 29 09:45:31 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:45:31 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc14 Message-ID: + lbuild für Nasm 2.06rc14 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc14/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc14/files/build.patch create mode 100644 lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild diff --git a/lbuilds/nasm/2.06rc14/files/build.patch b/lbuilds/nasm/2.06rc14/files/build.patch new file mode 100644 index 0000000..e492c2d --- /dev/null +++ b/lbuilds/nasm/2.06rc14/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc14/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc14/compiler.h ++++ src/nasm-2.06rc14/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc14/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc14/nasmlib.h ++++ src/nasm-2.06rc14/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc14/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc14/rdoff/rdfdump.c ++++ src/nasm-2.06rc14/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc14/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc14/rdoff/rdoff.c ++++ src/nasm-2.06rc14/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild b/lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild new file mode 100644 index 0000000..c46d3d8 --- /dev/null +++ b/lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc14/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------060505000109040204020004-- From Christian.Klahn at Live.de Sat Jan 29 09:53:40 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:53:40 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc15 Message-ID: + lbuild für Nasm 2.06rc15 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc15/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc15/files/build.patch create mode 100644 lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild diff --git a/lbuilds/nasm/2.06rc15/files/build.patch b/lbuilds/nasm/2.06rc15/files/build.patch new file mode 100644 index 0000000..b843f7b --- /dev/null +++ b/lbuilds/nasm/2.06rc15/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc15/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc15/compiler.h ++++ src/nasm-2.06rc15/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc15/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc15/nasmlib.h ++++ src/nasm-2.06rc15/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc15/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc15/rdoff/rdfdump.c ++++ src/nasm-2.06rc15/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc15/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc15/rdoff/rdoff.c ++++ src/nasm-2.06rc15/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild b/lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild new file mode 100644 index 0000000..34e4098 --- /dev/null +++ b/lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc15/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------000200000001020400020400-- From Christian.Klahn at Live.de Sat Jan 29 09:58:34 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:58:34 +0100 Subject: [PATCH] neuer lbuild Nasm 2.06rc16 Message-ID: + lbuild für Nasm 2.06rc16 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc16/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc16/files/build.patch create mode 100644 lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild diff --git a/lbuilds/nasm/2.06rc16/files/build.patch b/lbuilds/nasm/2.06rc16/files/build.patch new file mode 100644 index 0000000..ba77396 --- /dev/null +++ b/lbuilds/nasm/2.06rc16/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc16/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc16/compiler.h ++++ src/nasm-2.06rc16/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc16/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc16/nasmlib.h ++++ src/nasm-2.06rc16/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc16/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc16/rdoff/rdfdump.c ++++ src/nasm-2.06rc16/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc16/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc16/rdoff/rdoff.c ++++ src/nasm-2.06rc16/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild b/lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild new file mode 100644 index 0000000..7c95cd2 --- /dev/null +++ b/lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc16/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080104060204090504090100-- From Christian.Klahn at Live.de Fri Jan 28 23:49:46 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Fri, 28 Jan 2011 23:49:46 +0100 Subject: [PATCH 01/16] neuer lbuild Nasm 2.06rc1 Message-ID: + lbuild für Nasm 2.06rc1 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc1/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc1/files/build.patch create mode 100644 lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild diff --git a/lbuilds/nasm/2.06rc1/files/build.patch b/lbuilds/nasm/2.06rc1/files/build.patch new file mode 100644 index 0000000..4a9c898 --- /dev/null +++ b/lbuilds/nasm/2.06rc1/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc1/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc1/compiler.h ++++ src/nasm-2.06rc1/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc1/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc1/nasmlib.h ++++ src/nasm-2.06rc1/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc1/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc1/rdoff/rdfdump.c ++++ src/nasm-2.06rc1/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc1/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc1/rdoff/rdoff.c ++++ src/nasm-2.06rc1/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild b/lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild new file mode 100644 index 0000000..ac62a29 --- /dev/null +++ b/lbuilds/nasm/2.06rc1/nasm-2.06rc1.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc1/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0002-neuer-lbuild-Nasm-2.06rc3.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0002-neuer-lbuild-Nasm-2.06rc3.patch" From Christian.Klahn at Live.de Sat Jan 29 00:11:00 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:11:00 +0100 Subject: [PATCH 02/16] neuer lbuild Nasm 2.06rc3 Message-ID: + lbuild für Nasm 2.06rc3 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc3/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc3/files/build.patch create mode 100644 lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild diff --git a/lbuilds/nasm/2.06rc3/files/build.patch b/lbuilds/nasm/2.06rc3/files/build.patch new file mode 100644 index 0000000..9edb218 --- /dev/null +++ b/lbuilds/nasm/2.06rc3/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc3/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc3/compiler.h ++++ src/nasm-2.06rc3/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc3/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc3/nasmlib.h ++++ src/nasm-2.06rc3/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc3/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc3/rdoff/rdfdump.c ++++ src/nasm-2.06rc3/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc3/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc3/rdoff/rdoff.c ++++ src/nasm-2.06rc3/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild b/lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild new file mode 100644 index 0000000..b400528 --- /dev/null +++ b/lbuilds/nasm/2.06rc3/nasm-2.06rc3.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc3/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0003-neuer-lbuild-Nasm-2.06rc4.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0003-neuer-lbuild-Nasm-2.06rc4.patch" From Christian.Klahn at Live.de Sat Jan 29 00:12:36 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:12:36 +0100 Subject: [PATCH 03/16] neuer lbuild Nasm 2.06rc4 Message-ID: + lbuild für Nasm 2.06rc4 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc4/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc4/files/build.patch create mode 100644 lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild diff --git a/lbuilds/nasm/2.06rc4/files/build.patch b/lbuilds/nasm/2.06rc4/files/build.patch new file mode 100644 index 0000000..731e51e --- /dev/null +++ b/lbuilds/nasm/2.06rc4/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc4/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc4/compiler.h ++++ src/nasm-2.06rc4/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc4/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc4/nasmlib.h ++++ src/nasm-2.06rc4/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc4/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc4/rdoff/rdfdump.c ++++ src/nasm-2.06rc4/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc4/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc4/rdoff/rdoff.c ++++ src/nasm-2.06rc4/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild b/lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild new file mode 100644 index 0000000..051091c --- /dev/null +++ b/lbuilds/nasm/2.06rc4/nasm-2.06rc4.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc4/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0004-neuer-lbuild-Nasm-2.06rc5.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0004-neuer-lbuild-Nasm-2.06rc5.patch" From Christian.Klahn at Live.de Sat Jan 29 00:13:28 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:13:28 +0100 Subject: [PATCH 04/16] neuer lbuild Nasm 2.06rc5 Message-ID: + lbuild für Nasm 2.06rc5 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc5/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc5/files/build.patch create mode 100644 lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild diff --git a/lbuilds/nasm/2.06rc5/files/build.patch b/lbuilds/nasm/2.06rc5/files/build.patch new file mode 100644 index 0000000..e9bb71a --- /dev/null +++ b/lbuilds/nasm/2.06rc5/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc5/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc5/compiler.h ++++ src/nasm-2.06rc5/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc5/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc5/nasmlib.h ++++ src/nasm-2.06rc5/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc5/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc5/rdoff/rdfdump.c ++++ src/nasm-2.06rc5/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc5/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc5/rdoff/rdoff.c ++++ src/nasm-2.06rc5/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild b/lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild new file mode 100644 index 0000000..e67083c --- /dev/null +++ b/lbuilds/nasm/2.06rc5/nasm-2.06rc5.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc5/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0005-neuer-lbuild-Nasm-2.06rc6.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0005-neuer-lbuild-Nasm-2.06rc6.patch" From Christian.Klahn at Live.de Sat Jan 29 00:14:31 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:14:31 +0100 Subject: [PATCH 05/16] neuer lbuild Nasm 2.06rc6 Message-ID: + lbuild für Nasm 2.06rc6 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc6/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc6/files/build.patch create mode 100644 lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild diff --git a/lbuilds/nasm/2.06rc6/files/build.patch b/lbuilds/nasm/2.06rc6/files/build.patch new file mode 100644 index 0000000..12f43b8 --- /dev/null +++ b/lbuilds/nasm/2.06rc6/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc6/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc6/compiler.h ++++ src/nasm-2.06rc6/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc6/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc6/nasmlib.h ++++ src/nasm-2.06rc6/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc6/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc6/rdoff/rdfdump.c ++++ src/nasm-2.06rc6/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc6/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc6/rdoff/rdoff.c ++++ src/nasm-2.06rc6/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild b/lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild new file mode 100644 index 0000000..f5d619a --- /dev/null +++ b/lbuilds/nasm/2.06rc6/nasm-2.06rc6.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc6/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0006-neuer-lbuild-Nasm-2.06rc7.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0006-neuer-lbuild-Nasm-2.06rc7.patch" From Christian.Klahn at Live.de Sat Jan 29 00:15:08 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:15:08 +0100 Subject: [PATCH 06/16] neuer lbuild Nasm 2.06rc7 Message-ID: + lbuild für Nasm 2.06rc7 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc7/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc7/nasm-2.06rc7.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc7/files/build.patch create mode 100644 lbuilds/nasm/2.06rc7/nasm-2.06rc7.lbuild diff --git a/lbuilds/nasm/2.06rc7/files/build.patch b/lbuilds/nasm/2.06rc7/files/build.patch new file mode 100644 index 0000000..a47c881 --- /dev/null +++ b/lbuilds/nasm/2.06rc7/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc7/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc7/compiler.h ++++ src/nasm-2.06rc7/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc7/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc7/nasmlib.h ++++ src/nasm-2.06rc7/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc7/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc7/rdoff/rdfdump.c ++++ src/nasm-2.06rc7/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc7/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc7/rdoff/rdoff.c ++++ src/nasm-2.06rc7/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc7/nasm-2.06rc7.lbuild b/lbuilds/nasm/2.06rc7/nasm-2.06rc7.lbuild new file mode 100644 index 0000000..6dbe647 --- /dev/null +++ b/lbuilds/nasm/2.06rc7/nasm-2.06rc7.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc7/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0007-neuer-lbuild-Nasm-2.06rc9.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0007-neuer-lbuild-Nasm-2.06rc9.patch" From Christian.Klahn at Live.de Sat Jan 29 00:19:44 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:19:44 +0100 Subject: [PATCH 07/16] neuer lbuild Nasm 2.06rc9 Message-ID: + lbuild für Nasm 2.06rc9 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc8/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc8/files/build.patch create mode 100644 lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild diff --git a/lbuilds/nasm/2.06rc8/files/build.patch b/lbuilds/nasm/2.06rc8/files/build.patch new file mode 100644 index 0000000..5fb48df --- /dev/null +++ b/lbuilds/nasm/2.06rc8/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc8/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc8/compiler.h ++++ src/nasm-2.06rc8/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc8/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc8/nasmlib.h ++++ src/nasm-2.06rc8/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc8/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc8/rdoff/rdfdump.c ++++ src/nasm-2.06rc8/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc8/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc8/rdoff/rdoff.c ++++ src/nasm-2.06rc8/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild b/lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild new file mode 100644 index 0000000..926723c --- /dev/null +++ b/lbuilds/nasm/2.06rc8/nasm-2.06rc8.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc8/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0008-neuer-lbuild-Nasm-2.06rc9.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0008-neuer-lbuild-Nasm-2.06rc9.patch" From Christian.Klahn at Live.de Sat Jan 29 00:22:38 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 00:22:38 +0100 Subject: [PATCH 08/16] neuer lbuild Nasm 2.06rc9 Message-ID: + lbuild für Nasm 2.06rc9 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc9/files/build.patch | 69 ++++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc9/nasm-2.06rc9.lbuild | 49 +++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc9/files/build.patch create mode 100644 lbuilds/nasm/2.06rc9/nasm-2.06rc9.lbuild diff --git a/lbuilds/nasm/2.06rc9/files/build.patch b/lbuilds/nasm/2.06rc9/files/build.patch new file mode 100644 index 0000000..7b242f4 --- /dev/null +++ b/lbuilds/nasm/2.06rc9/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc9/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc9/compiler.h ++++ src/nasm-2.06rc9/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc9/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc9/nasmlib.h ++++ src/nasm-2.06rc9/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc9/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc9/rdoff/rdfdump.c ++++ src/nasm-2.06rc9/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc9/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc9/rdoff/rdoff.c ++++ src/nasm-2.06rc9/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc9/nasm-2.06rc9.lbuild b/lbuilds/nasm/2.06rc9/nasm-2.06rc9.lbuild new file mode 100644 index 0000000..cb3f96f --- /dev/null +++ b/lbuilds/nasm/2.06rc9/nasm-2.06rc9.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc9/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0009-neuer-lbuild-Nasm-2.06.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0009-neuer-lbuild-Nasm-2.06.patch" From Christian.Klahn at Live.de Sat Jan 29 09:32:06 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:32:06 +0100 Subject: [PATCH 09/16] neuer lbuild Nasm 2.06 Message-ID: + lbuild für Nasm 2.06 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06/files/build.patch | 69 +++++++++++++++++++++++++++++++++++ lbuilds/nasm/2.06/nasm-2.06.lbuild | 49 +++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06/files/build.patch create mode 100644 lbuilds/nasm/2.06/nasm-2.06.lbuild diff --git a/lbuilds/nasm/2.06/files/build.patch b/lbuilds/nasm/2.06/files/build.patch new file mode 100644 index 0000000..748f7bb --- /dev/null +++ b/lbuilds/nasm/2.06/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06/compiler.h +=================================================================== +--- src.orig/nasm-2.06/compiler.h ++++ src/nasm-2.06/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06/nasmlib.h ++++ src/nasm-2.06/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06/rdoff/rdfdump.c ++++ src/nasm-2.06/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06/rdoff/rdoff.c ++++ src/nasm-2.06/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06/nasm-2.06.lbuild b/lbuilds/nasm/2.06/nasm-2.06.lbuild new file mode 100644 index 0000000..6112c8f --- /dev/null +++ b/lbuilds/nasm/2.06/nasm-2.06.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0010-neuer-lbuild-Nasm-2.06rc10.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0010-neuer-lbuild-Nasm-2.06rc10.patch" From Christian.Klahn at Live.de Sat Jan 29 09:33:16 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:33:16 +0100 Subject: [PATCH 10/16] neuer lbuild Nasm 2.06rc10 Message-ID: + lbuild für Nasm 2.06rc10 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc10/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc10/files/build.patch create mode 100644 lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild diff --git a/lbuilds/nasm/2.06rc10/files/build.patch b/lbuilds/nasm/2.06rc10/files/build.patch new file mode 100644 index 0000000..3968684 --- /dev/null +++ b/lbuilds/nasm/2.06rc10/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc10/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc10/compiler.h ++++ src/nasm-2.06rc10/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc10/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc10/nasmlib.h ++++ src/nasm-2.06rc10/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc10/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc10/rdoff/rdfdump.c ++++ src/nasm-2.06rc10/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc10/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc10/rdoff/rdoff.c ++++ src/nasm-2.06rc10/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild b/lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild new file mode 100644 index 0000000..4e8c958 --- /dev/null +++ b/lbuilds/nasm/2.06rc10/nasm-2.06rc10.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc10/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0011-neuer-lbuild-Nasm-2.06rc11.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0011-neuer-lbuild-Nasm-2.06rc11.patch" From Christian.Klahn at Live.de Sat Jan 29 09:36:07 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:36:07 +0100 Subject: [PATCH 11/16] neuer lbuild Nasm 2.06rc11 Message-ID: + lbuild für Nasm 2.06rc11 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc11/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc11/files/build.patch create mode 100644 lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild diff --git a/lbuilds/nasm/2.06rc11/files/build.patch b/lbuilds/nasm/2.06rc11/files/build.patch new file mode 100644 index 0000000..b85a921 --- /dev/null +++ b/lbuilds/nasm/2.06rc11/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc11/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc11/compiler.h ++++ src/nasm-2.06rc11/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc11/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc11/nasmlib.h ++++ src/nasm-2.06rc11/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc11/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc11/rdoff/rdfdump.c ++++ src/nasm-2.06rc11/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc11/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc11/rdoff/rdoff.c ++++ src/nasm-2.06rc11/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild b/lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild new file mode 100644 index 0000000..524d2d7 --- /dev/null +++ b/lbuilds/nasm/2.06rc11/nasm-2.06rc11.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc11/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0012-neuer-lbuild-Nasm-2.06rc12.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0012-neuer-lbuild-Nasm-2.06rc12.patch" From Christian.Klahn at Live.de Sat Jan 29 09:39:34 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:39:34 +0100 Subject: [PATCH 12/16] neuer lbuild Nasm 2.06rc12 Message-ID: + lbuild für Nasm 2.06rc12 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc12/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc12/nasm-2.06rc12.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc12/files/build.patch create mode 100644 lbuilds/nasm/2.06rc12/nasm-2.06rc12.lbuild diff --git a/lbuilds/nasm/2.06rc12/files/build.patch b/lbuilds/nasm/2.06rc12/files/build.patch new file mode 100644 index 0000000..8e80c95 --- /dev/null +++ b/lbuilds/nasm/2.06rc12/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc12/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc12/compiler.h ++++ src/nasm-2.06rc12/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc12/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc12/nasmlib.h ++++ src/nasm-2.06rc12/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc12/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc12/rdoff/rdfdump.c ++++ src/nasm-2.06rc12/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc12/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc12/rdoff/rdoff.c ++++ src/nasm-2.06rc12/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc12/nasm-2.06rc12.lbuild b/lbuilds/nasm/2.06rc12/nasm-2.06rc12.lbuild new file mode 100644 index 0000000..3e3752e --- /dev/null +++ b/lbuilds/nasm/2.06rc12/nasm-2.06rc12.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc12/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0013-neuer-lbuild-Nasm-2.06rc13.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0013-neuer-lbuild-Nasm-2.06rc13.patch" From Christian.Klahn at Live.de Sat Jan 29 09:40:51 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:40:51 +0100 Subject: [PATCH 13/16] neuer lbuild Nasm 2.06rc13 Message-ID: + lbuild für Nasm 2.06rc13 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc13/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc13/nasm-2.06rc13.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc13/files/build.patch create mode 100644 lbuilds/nasm/2.06rc13/nasm-2.06rc13.lbuild diff --git a/lbuilds/nasm/2.06rc13/files/build.patch b/lbuilds/nasm/2.06rc13/files/build.patch new file mode 100644 index 0000000..f7d4ee9 --- /dev/null +++ b/lbuilds/nasm/2.06rc13/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc13/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc13/compiler.h ++++ src/nasm-2.06rc13/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc13/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc13/nasmlib.h ++++ src/nasm-2.06rc13/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc13/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc13/rdoff/rdfdump.c ++++ src/nasm-2.06rc13/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc13/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc13/rdoff/rdoff.c ++++ src/nasm-2.06rc13/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc13/nasm-2.06rc13.lbuild b/lbuilds/nasm/2.06rc13/nasm-2.06rc13.lbuild new file mode 100644 index 0000000..dd35201 --- /dev/null +++ b/lbuilds/nasm/2.06rc13/nasm-2.06rc13.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc13/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0014-neuer-lbuild-Nasm-2.06rc14.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0014-neuer-lbuild-Nasm-2.06rc14.patch" From Christian.Klahn at Live.de Sat Jan 29 09:45:31 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:45:31 +0100 Subject: [PATCH 14/16] neuer lbuild Nasm 2.06rc14 Message-ID: + lbuild für Nasm 2.06rc14 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc14/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc14/files/build.patch create mode 100644 lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild diff --git a/lbuilds/nasm/2.06rc14/files/build.patch b/lbuilds/nasm/2.06rc14/files/build.patch new file mode 100644 index 0000000..e492c2d --- /dev/null +++ b/lbuilds/nasm/2.06rc14/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc14/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc14/compiler.h ++++ src/nasm-2.06rc14/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc14/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc14/nasmlib.h ++++ src/nasm-2.06rc14/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc14/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc14/rdoff/rdfdump.c ++++ src/nasm-2.06rc14/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc14/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc14/rdoff/rdoff.c ++++ src/nasm-2.06rc14/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild b/lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild new file mode 100644 index 0000000..c46d3d8 --- /dev/null +++ b/lbuilds/nasm/2.06rc14/nasm-2.06rc14.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc14/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0015-neuer-lbuild-Nasm-2.06rc15.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0015-neuer-lbuild-Nasm-2.06rc15.patch" From Christian.Klahn at Live.de Sat Jan 29 09:53:40 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:53:40 +0100 Subject: [PATCH 15/16] neuer lbuild Nasm 2.06rc15 Message-ID: + lbuild für Nasm 2.06rc15 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc15/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc15/files/build.patch create mode 100644 lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild diff --git a/lbuilds/nasm/2.06rc15/files/build.patch b/lbuilds/nasm/2.06rc15/files/build.patch new file mode 100644 index 0000000..b843f7b --- /dev/null +++ b/lbuilds/nasm/2.06rc15/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc15/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc15/compiler.h ++++ src/nasm-2.06rc15/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc15/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc15/nasmlib.h ++++ src/nasm-2.06rc15/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc15/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc15/rdoff/rdfdump.c ++++ src/nasm-2.06rc15/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc15/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc15/rdoff/rdoff.c ++++ src/nasm-2.06rc15/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild b/lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild new file mode 100644 index 0000000..34e4098 --- /dev/null +++ b/lbuilds/nasm/2.06rc15/nasm-2.06rc15.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc15/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206 Content-Type: text/x-patch; name="0016-neuer-lbuild-Nasm-2.06rc16.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0016-neuer-lbuild-Nasm-2.06rc16.patch" From Christian.Klahn at Live.de Sat Jan 29 09:58:34 2011 From: Christian.Klahn at Live.de (Christian Klahn) Date: Sat, 29 Jan 2011 09:58:34 +0100 Subject: [PATCH 16/16] neuer lbuild Nasm 2.06rc16 Message-ID: + lbuild für Nasm 2.06rc16 hinzugefügt Signed-off-by: Christian Klahn --- lbuilds/nasm/2.06rc16/files/build.patch | 69 ++++++++++++++++++++++++++++ lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild | 49 ++++++++++++++++++++ 2 files changed, 118 insertions(+), 0 deletions(-) create mode 100644 lbuilds/nasm/2.06rc16/files/build.patch create mode 100644 lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild diff --git a/lbuilds/nasm/2.06rc16/files/build.patch b/lbuilds/nasm/2.06rc16/files/build.patch new file mode 100644 index 0000000..ba77396 --- /dev/null +++ b/lbuilds/nasm/2.06rc16/files/build.patch @@ -0,0 +1,69 @@ +Index: src/nasm-2.06rc16/compiler.h +=================================================================== +--- src.orig/nasm-2.06rc16/compiler.h ++++ src/nasm-2.06rc16/compiler.h +@@ -147,4 +147,6 @@ char *strsep(char **, const char *); + # define unlikely(x) (!!(x)) + #endif + ++#include "nasmlib.h" ++ + #endif /* NASM_COMPILER_H */ +Index: src/nasm-2.06rc16/nasmlib.h +=================================================================== +--- src.orig/nasm-2.06rc16/nasmlib.h ++++ src/nasm-2.06rc16/nasmlib.h +@@ -18,6 +18,29 @@ + #include + #endif + ++#ifdef __TYNDUR__ ++ ++#define PRId32 "d" ++#define PRId64 "lld" ++ ++#define PRIx8 "hhx" ++#define PRIx16 "hx" ++#define PRIx32 "x" ++#define PRIx64 "llx" ++ ++#define PRIX32 "X" ++#define PRIX64 "llX" ++ ++#define PRIu32 "u" ++#define PRIu64 "llu" ++ ++#define INT32_MAX 0x7fffffff ++#define UINT64_C(n) n##ULL ++#define UINT32_C(n) n##U ++ ++#endif ++ ++ + /* + * tolower table -- avoids a function call on some platforms. + * NOTE: unlike the tolower() function in ctype, EOF is *NOT* +Index: src/nasm-2.06rc16/rdoff/rdfdump.c +=================================================================== +--- src.orig/nasm-2.06rc16/rdoff/rdfdump.c ++++ src/nasm-2.06rc16/rdoff/rdfdump.c +@@ -3,6 +3,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include +Index: src/nasm-2.06rc16/rdoff/rdoff.c +=================================================================== +--- src.orig/nasm-2.06rc16/rdoff/rdoff.c ++++ src/nasm-2.06rc16/rdoff/rdoff.c +@@ -16,6 +16,7 @@ + */ + + #include "compiler.h" ++#include "nasmlib.h" + + #include + #include diff --git a/lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild b/lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild new file mode 100644 index 0000000..7c95cd2 --- /dev/null +++ b/lbuilds/nasm/2.06rc16/nasm-2.06rc16.lbuild @@ -0,0 +1,49 @@ +include lutils +include toolchain + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="http://lowlevel.brainsware.org/wiki/index.php/LOST/Pakete/Nasm" +SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.06rc16/${P}.tar.bz2" + +LICENSE="BSD" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { + lunpack ${P}.tar.bz2 + + ln -s ${F} patches + [ -f ${F}/series ] && ln -s ${F}/series series + for i in ${F}/*.patch; do + [ -L series ] || echo `basename $i` >> series + (which quilt > /dev/null 2>&1) || (patch -p1 < $i) || die "Fehler beim Anwenden von $i" + done + (which quilt > /dev/null 2>&1) && quilt push -a || die "Fehler beim Anwenden der Patches" +} + +src_configure() { + cd ${MY_S} + ./configure \ + --build=`tc-build` \ + --host=`tc-host` \ + --target=`tc-host` \ + --prefix=${R} \ + --disable-nls \ + --disable-dependency-tracking \ + || die "configure failed" +} + + +src_compile() { + cd ${MY_S} + lmake || die "make failed" +} + +src_install() { + cd ${MY_S} + lmake INSTALLROOT="${D}" install || die "make install failed" + rm -r ${D}/${R}/share +} -- 1.7.1 --------------080303090703090400020206--