Changeset c6588ce in mainline for boot


Ignore:
Timestamp:
2012-05-05T08:12:17Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ee04c28
Parents:
2cc7f16 (diff), d21e935c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
boot
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r2cc7f16 rc6588ce  
    6666                cp "$$file" "$(DIST_PATH)/app/" ; \
    6767        done
    68         for file in $(NET_CFG) ; do \
    69                 cp "$$file" "$(DIST_PATH)/cfg/net/" ; \
    70         done
    7168        for drv in $(RD_DRVS) ; do \
    7269                drv_dir="`dirname "$$drv"`" ; \

  • boot/Makefile.build

    r2cc7f16 rc6588ce  
    3434OPTIMIZATION = 3
    3535
    36 DEFS = -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
     36DEFS = -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
    3737
    3838GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \

  • boot/Makefile.common

    r2cc7f16 rc6588ce  
    9898        $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
    9999        $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
    100         $(USPACE_PATH)/srv/clip/clip \
     100        $(USPACE_PATH)/srv/clipboard/clipboard \
    101101        $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
    102102        $(USPACE_PATH)/srv/fs/fat/fat \
    … …  
    106106        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
    107107        $(USPACE_PATH)/srv/hid/remcons/remcons \
     108        $(USPACE_PATH)/srv/net/ethip/ethip \
     109        $(USPACE_PATH)/srv/net/inet/inet \
     110        $(USPACE_PATH)/srv/net/loopip/loopip \
     111        $(USPACE_PATH)/srv/net/tcp/tcp \
     112        $(USPACE_PATH)/srv/net/udp/udp \
    108113        $(USPACE_PATH)/srv/taskmon/taskmon \
    109         $(USPACE_PATH)/srv/net/nil/eth/eth \
    110         $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
    111         $(USPACE_PATH)/srv/net/il/arp/arp \
    112         $(USPACE_PATH)/srv/net/il/ip/ip \
    113         $(USPACE_PATH)/srv/net/tl/icmp/icmp \
    114         $(USPACE_PATH)/srv/net/tl/udp/udp \
    115         $(USPACE_PATH)/srv/net/tl/tcp/tcp \
    116         $(USPACE_PATH)/srv/net/net/net \
    117114        $(USPACE_PATH)/srv/devman/devman
    118115
    … …  
    123120        test/test2 \
    124121        test/test3 \
    125         nic/lo \
    126122        nic/ne2k \
    127123        nic/e1k \
    … …  
    161157        $(USPACE_PATH)/app/edit/edit \
    162158        $(USPACE_PATH)/app/ext2info/ext2info \
     159        $(USPACE_PATH)/app/inetcfg/inetcfg \
    163160        $(USPACE_PATH)/app/kill/kill \
    164161        $(USPACE_PATH)/app/killall/killall \
    165162        $(USPACE_PATH)/app/locinfo/locinfo \
    166163        $(USPACE_PATH)/app/mkfat/mkfat \
     164        $(USPACE_PATH)/app/mkexfat/mkexfat \
    167165        $(USPACE_PATH)/app/mkmfs/mkmfs \
    168166        $(USPACE_PATH)/app/lsusb/lsusb \
    … …  
    202200endif
    203201
    204 ifneq ($(CONFIG_BAREBONE),y)
    205 NET_CFG = \
    206         $(USPACE_PATH)/srv/net/cfg/general \
    207         $(USPACE_PATH)/srv/net/cfg/lo.nic \
    208         $(USPACE_PATH)/srv/net/cfg/ne2k.nic \
    209         $(USPACE_PATH)/srv/net/cfg/e1k.nic
    210 endif
    211 
    212202COMPONENTS = \
    213203        $(KERNEL_PATH)/kernel.bin \

  • boot/arch/arm32/Makefile.inc

    r2cc7f16 rc6588ce  
    3939BITS = 32
    4040ENDIANESS = LE
     41EXTRA_CFLAGS = -march=armv4
    4142
    4243RD_SRVS_ESSENTIAL += \
    43         $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
    44         $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
     44        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
     45        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24xx_uart
    4546
    4647RD_SRVS_NON_ESSENTIAL += \
    … …  
    4950SOURCES = \
    5051        arch/$(BARCH)/src/asm.S \
     52        arch/$(BARCH)/src/eabi.S \
    5153        arch/$(BARCH)/src/main.c \
    5254        arch/$(BARCH)/src/mm.c \

  • boot/arch/arm32/src/asm.S

    r2cc7f16 rc6588ce  
    6060        # before passing control to the copied code.
    6161        #
    62         bx r0
     62        mov pc, r0

  • boot/arch/ia64/src/main.c

    r2cc7f16 rc6588ce  
    189189        printf("\nInflating components ... ");
    190190       
     191        /*
     192         * We will use the next available address for a copy of each component to
     193         * make sure that inflate() works with disjunctive memory regions.
     194         */
     195        top = ALIGN_UP(top, PAGE_SIZE);
     196
    191197        for (i = cnt; i > 0; i--) {
    192198                printf("%s ", components[i - 1].name);
    193199               
    194                 int err = inflate(components[i - 1].start, components[i - 1].size,
     200                /*
     201                 * Copy the component to a location which is guaranteed not to
     202                 * overlap with the destination for inflate().
     203                 */
     204                memmove((void *) top, components[i - 1].start, components[i - 1].size);
     205               
     206                int err = inflate((void *) top, components[i - 1].size,
    195207                    dest[i - 1], components[i - 1].inflated);
    196208               

  • boot/arch/ia64/src/pal_asm.S

    r2cc7f16 rc6588ce  
    3232
    3333pal_static_call:
    34         alloc loc0 = ar.pfs, 7, 5, 0, 0
     34        alloc loc0 = ar.pfs, 7, 6, 0, 0
     35
     36        mov loc1 = psr ;;
     37        mov psr.l = r0 ;;
     38        srlz.i
     39        srlz.d
    3540       
    36         mov loc1 = gp
    37         mov loc2 = rp
     41        mov loc2 = gp
     42        mov loc3 = rp
    3843       
    39         addl loc3 = @gprel(pal_proc), gp
    40        
     44        addl loc4 = @gprel(pal_proc), gp
     45
    4146        mov r28 = in0
    4247        mov r29 = in1
    … …  
    4449        mov r31 = in3 ;;
    4550       
    46         ld8 loc3 = [loc3]
    47         movl loc4 = 0f ;;
     51        ld8 loc4 = [loc4]
     52        movl loc5 = 0f ;;
    4853
    49         mov b6 = loc3
    50         mov rp = loc4 ;;
     54        mov b6 = loc4
     55        mov rp = loc5 ;;
    5156        br.cond.sptk.many b6
    5257
    53580:
     59        mov psr.l = loc1 ;;
     60        srlz.i
     61        srlz.d
     62
    5463        cmp.ne p7,p0 = 0, in4
    5564        cmp.ne p8,p0 = 0, in5
    … …  
    6069(p9)    st8 [in6] = r11
    6170       
    62         mov gp = loc1
    63         mov rp = loc2 ;;
     71        mov gp = loc2
     72        mov rp = loc3 ;;
    6473       
    6574        mov ar.pfs = loc0

  • boot/arch/ia64/src/sal_asm.S

    r2cc7f16 rc6588ce  
    2929.explicit
    3030
     31#define STACK_SCRATCH_AREA      16
     32#define STACK_IN8               (0 + STACK_SCRATCH_AREA)
     33#define STACK_IN9               (8 + STACK_SCRATCH_AREA)
     34#define STACK_IN10              (16 + STACK_SCRATCH_AREA)
     35
    3136.global sal_call
    3237
    … …  
    3944#
    4045sal_call:
    41         alloc loc0 = ar.pfs, 11, 5, 8, 0
     46        alloc loc0 = ar.pfs, 8, 8, 8, 0
    4247       
     48        adds sp = -STACK_SCRATCH_AREA, sp
     49
    4350        mov loc1 = gp
    4451        mov loc2 = rp
    … …  
    5764       
    5865        ld8 loc3 = [loc3]
    59         ld8 gp = [loc4] ;;
     66        ld8 gp = [loc4]
     67
     68        adds r14 = STACK_IN8 + STACK_SCRATCH_AREA, sp
     69        adds r15 = STACK_IN9 + STACK_SCRATCH_AREA, sp
     70        adds r16 = STACK_IN10 + STACK_SCRATCH_AREA, sp ;;
     71
     72        ld8 loc5 = [r14]
     73        ld8 loc6 = [r15]
     74        ld8 loc7 = [r16]
    6075       
    6176        mov b6 = loc3 ;;
    6277        br.call.sptk.many rp = b6
    6378       
    64         cmp.ne p7,p0 = 0, in8
    65         cmp.ne p8,p0 = 0, in9
    66         cmp.ne p9,p0 = 0, in10 ;;
     79        cmp.ne p7,p0 = 0, loc5
     80        cmp.ne p8,p0 = 0, loc6
     81        cmp.ne p9,p0 = 0, loc7 ;;
    6782       
    68 (p7)    st8 [in8] = r9
    69 (p8)    st8 [in9] = r10
    70 (p9)    st8 [in10] = r11
     83(p7)    st8 [loc5] = r9
     84(p8)    st8 [loc6] = r10
     85(p9)    st8 [loc7] = r11
    7186       
    7287        mov gp = loc1
    73         mov rp = loc2 ;;
     88        mov rp = loc2
     89
     90        adds sp = STACK_SCRATCH_AREA, sp ;;
    7491       
    7592        mov ar.pfs = loc0
    7693        br.ret.sptk.many rp
     94

  • boot/genarch/include/division.h

    r2cc7f16 rc6588ce  
    3333#define BOOT_DIVISION_H_
    3434
    35 /* 32bit integer division */
    3635extern int __divsi3(int, int);
    37 
    38 /* 64bit integer division */
    3936extern long long __divdi3(long long, long long);
    4037
    41 /* 32bit unsigned integer division */
    4238extern unsigned int __udivsi3(unsigned int, unsigned int);
    43 
    44 /* 64bit unsigned integer division */
    4539extern unsigned long long __udivdi3(unsigned long long, unsigned long long);
    4640
    47 /* 32bit remainder of the signed division */
    4841extern int __modsi3(int, int);
    49 
    50 /* 64bit remainder of the signed division */
    5142extern long long __moddi3(long long, long long);
    5243
    53 /* 32bit remainder of the unsigned division */
    5444extern unsigned int __umodsi3(unsigned int, unsigned int);
    55 
    56 /* 64bit remainder of the unsigned division */
    5745extern unsigned long long __umoddi3(unsigned long long, unsigned long long);
    5846
     47extern int __divmodsi3(int, int, int *);
     48extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *);
     49
     50extern long long __divmoddi3(long long, long long, long long *);
    5951extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long,
    6052    unsigned long long *);

  • boot/genarch/src/division.c

    r2cc7f16 rc6588ce  
    7373{
    7474        unsigned long long result;
    75         int steps = sizeof(unsigned long long) * 8; 
     75        int steps = sizeof(unsigned long long) * 8;
    7676       
    7777        *remainder = 0;
    … …  
    104104
    105105/* 32bit integer division */
    106 int __divsi3(int a, int b) 
     106int __divsi3(int a, int b)
    107107{
    108108        unsigned int rem;
    … …  
    116116
    117117/* 64bit integer division */
    118 long long __divdi3(long long a, long long b) 
     118long long __divdi3(long long a, long long b)
    119119{
    120120        unsigned long long rem;
    … …  
    155155
    156156/* 64bit remainder of the signed division */
    157 long long __moddi3(long long a,long long b)
     157long long __moddi3(long long a, long long b)
    158158{
    159159        unsigned long long rem;
    … …  
    183183}
    184184
     185int __divmodsi3(int a, int b, int *c)
     186{
     187        unsigned int rem;
     188        int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem);
     189       
     190        if (SGN(a) == SGN(b)) {
     191                *c = rem;
     192                return result;
     193        }
     194       
     195        *c = -rem;
     196        return -result;
     197}
     198
     199unsigned int __udivmodsi3(unsigned int a, unsigned int b,
     200    unsigned int *c)
     201{
     202        return divandmod32(a, b, c);
     203}
     204
     205long long __divmoddi3(long long a, long long b, long long *c)
     206{
     207        unsigned long long rem;
     208        long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem);
     209       
     210        if (SGN(a) == SGN(b)) {
     211                *c = rem;
     212                return result;
     213        }
     214       
     215        *c = -rem;
     216        return -result;
     217}
     218
    185219unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b,
    186220    unsigned long long *c)

  • boot/generic/include/memstr.h

    r2cc7f16 rc6588ce  
    3636
    3737extern void *memcpy(void *, const void *, size_t);
     38extern void *memmove(void *, const void *, size_t);
    3839
    3940#endif

  • boot/generic/src/memstr.c

    r2cc7f16 rc6588ce  
    5151}
    5252
     53/** Move memory block with possible overlapping.
     54 *
     55 * Copy cnt bytes from src address to dst address. The source
     56 * and destination memory areas may overlap.
     57 *
     58 * @param dst Destination address to copy to.
     59 * @param src Source address to copy from.
     60 * @param cnt Number of bytes to copy.
     61 *
     62 * @return Destination address.
     63 *
     64 */
     65void *memmove(void *dst, const void *src, size_t cnt)
     66{
     67        /* Nothing to do? */
     68        if (src == dst)
     69                return dst;
     70       
     71        /* Non-overlapping? */
     72        if ((dst >= src + cnt) || (src >= dst + cnt))
     73                return memcpy(dst, src, cnt);
     74       
     75        uint8_t *dp;
     76        const uint8_t *sp;
     77       
     78        /* Which direction? */
     79        if (src > dst) {
     80                /* Forwards. */
     81                dp = dst;
     82                sp = src;
     83               
     84                while (cnt-- != 0)
     85                        *dp++ = *sp++;
     86        } else {
     87                /* Backwards. */
     88                dp = dst + (cnt - 1);
     89                sp = src + (cnt - 1);
     90               
     91                while (cnt-- != 0)
     92                        *dp-- = *sp--;
     93        }
     94       
     95        return dst;
     96}
     97
    5398/** @}
    5499 */

  • boot/generic/src/printf_core.c

    r2cc7f16 rc6588ce  
    210210        /* Print leading spaces. */
    211211        size_t strw = str_length(str);
    212         if (precision == 0)
     212        if ((precision == 0) || (precision > strw))
    213213                precision = strw;
    214214       

  • boot/generic/src/str.c

    r2cc7f16 rc6588ce  
    100100#include <str.h>
    101101#include <errno.h>
     102
     103/** Check the condition if wchar_t is signed */
     104#ifdef WCHAR_IS_UNSIGNED
     105        #define WCHAR_SIGNED_CHECK(cond)  (true)
     106#else
     107        #define WCHAR_SIGNED_CHECK(cond)  (cond)
     108#endif
    102109
    103110/** Byte mask consisting of lowest @n bits (out of 8) */
    … …  
    198205 *         code was invalid.
    199206 */
    200 int chr_encode(wchar_t ch, char *str, size_t *offset, size_t size)
     207int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
    201208{
    202209        if (*offset >= size)
    … …  
    325332bool ascii_check(wchar_t ch)
    326333{
    327         if ((ch >= 0) && (ch <= 127))
     334        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
    328335                return true;
    329336       
    … …  
    338345bool chr_check(wchar_t ch)
    339346{
    340         if ((ch >= 0) && (ch <= 1114111))
     347        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
    341348                return true;
    342349       

  • boot/generic/src/version.c

    r2cc7f16 rc6588ce  
    3232
    3333static const char *project = "HelenOS bootloader";
    34 static const char *copyright = "Copyright (c) 2001-2011 HelenOS project";
     34static const char *copyright = STRING(COPYRIGHT);
    3535static const char *release = STRING(RELEASE);
    3636static const char *name = STRING(NAME);
Note: See TracChangeset for help on using the changeset viewer.