Changeset 5a4fef9 in mainline for kernel


Ignore:
Timestamp:
2009-11-16T21:24:28Z (16 years ago)
Author:
Pavel Rimsky <pavel@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
18baf9c0
Parents:
5f678b1c (diff), 9c70ed6 (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:

merged head changes to this branch

Location:
kernel
Files:
2 added
16 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    r5f678b1c r5a4fef9  
    2727#
    2828
     29include Makefile.common
    2930
    30 ## Include configuration
    31 #
     31.PHONY: all clean
    3232
    33 include ../version
    34 -include ../Makefile.config
    35 -include ../config.defs
    36 
    37 INCLUDES = generic/include
    38 OPTIMIZATION = 3
    39 
    40 ifndef CROSS_PREFIX
    41         CROSS_PREFIX = /usr/local
    42 endif
    43 
    44 ## Common compiler flags
    45 #
    46 
    47 DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
    48 
    49 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
    50         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    51         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    52         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
    53         -pipe
    54 
    55 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
    56         -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
    57         -Werror -wd170
    58 
    59 SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
    60         -xnolib -xc99=all -features=extensions \
    61         -erroff=E_ZERO_SIZED_STRUCT_UNION
    62 
    63 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
    64         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    65         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    66         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -pipe \
    67         -arch $(CLANG_ARCH)
    68 
    69 LFLAGS = -M
    70 AFLAGS =
    71 
    72 -include arch/$(KARCH)/Makefile.inc
    73 -include genarch/Makefile.inc
    74 
    75 ## The at-sign
    76 #
    77 # The $(ATSIGN) variable holds the ASCII character representing the at-sign
    78 # ('@') used in various $(AS) constructs (e.g. @progbits). On architectures that
    79 # don't use '@' for starting a comment, $(ATSIGN) is merely '@'. However, on
    80 # those that do use it for starting a comment (e.g. arm32), $(ATSIGN) must be
    81 # defined as the percentile-sign ('%') in the architecture-dependent
    82 # Makefile.inc.
    83 #
    84 ATSIGN ?= @
    85 
    86 ## Cross-platform assembly to start a symtab.data section
    87 #
    88 SYMTAB_SECTION=".section symtab.data, \"a\", $(ATSIGN)progbits;"
    89 
    90 ## Simple detection for the type of the host system
    91 #
    92 HOST = $(shell uname)
    93 
    94 ## On Solaris, some utilities have slightly different names
    95 #
    96 ifeq ($(HOST),SunOS)
    97         BINUTILS_PREFIX = "g"
    98 else
    99         BINUTILS_PREFIX = ""
    100 endif
    101 
    102 ## Toolchain configuration
    103 #
    104 
    105 ifeq ($(COMPILER),gcc_native)
    106         CC = gcc
    107         GCC = $(CC)
    108         AS = $(BINUTILS_PREFIX)as
    109         LD = $(BINUTILS_PREFIX)ld
    110         OBJCOPY = $(BINUTILS_PREFIX)objcopy
    111         OBJDUMP = $(BINUTILS_PREFIX)objdump
    112         LIBDIR = /usr/lib
    113         CFLAGS = $(GCC_CFLAGS)
    114         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    115 endif
    116 
    117 ifeq ($(COMPILER),gcc_cross)
    118         CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
    119         GCC = $(CC)
    120         AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as
    121         LD = $(TOOLCHAIN_DIR)/bin/$(TARGET)-ld
    122         OBJCOPY = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objcopy
    123         OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
    124         LIBDIR = $(TOOLCHAIN_DIR)/lib
    125         CFLAGS = $(GCC_CFLAGS)
    126         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    127 endif
    128 
    129 ifeq ($(COMPILER),icc)
    130         CC = icc
    131         GCC = gcc
    132         AS = as
    133         LD = ld
    134         OBJCOPY = objcopy
    135         OBJDUMP = objdump
    136         LIBDIR = /usr/lib
    137         CFLAGS = $(ICC_CFLAGS)
    138         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    139 endif
    140 
    141 ifeq ($(COMPILER),suncc)
    142         CC = suncc
    143         GCC = gcc
    144         AS = $(BINUTILS_PREFIX)as
    145         LD = $(BINUTILS_PREFIX)ld
    146         OBJCOPY = $(BINUTILS_PREFIX)objcopy
    147         OBJDUMP = $(BINUTILS_PREFIX)objdump
    148         LIBDIR = /usr/lib
    149         CFLAGS = $(SUNCC_CFLAGS)
    150         DEFS += $(CONFIG_DEFS)
    151         DEPEND_DEFS = $(DEFS)
    152 endif
    153 
    154 ifeq ($(COMPILER),clang)
    155         CC = clang
    156         GCC = gcc
    157         AS = $(BINUTILS_PREFIX)as
    158         LD = $(BINUTILS_PREFIX)ld
    159         OBJCOPY = $(BINUTILS_PREFIX)objcopy
    160         OBJDUMP = $(BINUTILS_PREFIX)objdump
    161         LIBDIR = /usr/lib
    162         CFLAGS = $(CLANG_CFLAGS)
    163         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    164 endif
    165 
    166 ## Generic kernel sources
    167 #
    168 
    169 GENERIC_SOURCES = \
    170         generic/src/adt/avl.c \
    171         generic/src/adt/bitmap.c \
    172         generic/src/adt/btree.c \
    173         generic/src/adt/hash_table.c \
    174         generic/src/adt/list.c \
    175         generic/src/console/chardev.c \
    176         generic/src/console/console.c \
    177         generic/src/cpu/cpu.c \
    178         generic/src/ddi/ddi.c \
    179         generic/src/ddi/irq.c \
    180         generic/src/ddi/device.c \
    181         generic/src/debug/symtab.c \
    182         generic/src/interrupt/interrupt.c \
    183         generic/src/main/main.c \
    184         generic/src/main/kinit.c \
    185         generic/src/main/uinit.c \
    186         generic/src/main/version.c \
    187         generic/src/main/shutdown.c \
    188         generic/src/proc/program.c \
    189         generic/src/proc/scheduler.c \
    190         generic/src/proc/thread.c \
    191         generic/src/proc/task.c \
    192         generic/src/proc/the.c \
    193         generic/src/proc/tasklet.c \
    194         generic/src/syscall/syscall.c \
    195         generic/src/syscall/copy.c \
    196         generic/src/mm/buddy.c \
    197         generic/src/mm/frame.c \
    198         generic/src/mm/page.c \
    199         generic/src/mm/tlb.c \
    200         generic/src/mm/as.c \
    201         generic/src/mm/backend_anon.c \
    202         generic/src/mm/backend_elf.c \
    203         generic/src/mm/backend_phys.c \
    204         generic/src/mm/slab.c \
    205         generic/src/lib/func.c \
    206         generic/src/lib/memstr.c \
    207         generic/src/lib/sort.c \
    208         generic/src/lib/string.c \
    209         generic/src/lib/elf.c \
    210         generic/src/lib/rd.c \
    211         generic/src/printf/printf_core.c \
    212         generic/src/printf/printf.c \
    213         generic/src/printf/snprintf.c \
    214         generic/src/printf/vprintf.c \
    215         generic/src/printf/vsnprintf.c \
    216         generic/src/time/clock.c \
    217         generic/src/time/timeout.c \
    218         generic/src/time/delay.c \
    219         generic/src/preempt/preemption.c \
    220         generic/src/synch/spinlock.c \
    221         generic/src/synch/condvar.c \
    222         generic/src/synch/rwlock.c \
    223         generic/src/synch/mutex.c \
    224         generic/src/synch/semaphore.c \
    225         generic/src/synch/smc.c \
    226         generic/src/synch/waitq.c \
    227         generic/src/synch/futex.c \
    228         generic/src/smp/ipi.c \
    229         generic/src/smp/smp.c \
    230         generic/src/ipc/ipc.c \
    231         generic/src/ipc/sysipc.c \
    232         generic/src/ipc/ipcrsc.c \
    233         generic/src/ipc/irq.c \
    234         generic/src/ipc/event.c \
    235         generic/src/security/cap.c \
    236         generic/src/sysinfo/sysinfo.c
    237 
    238 ## Kernel console support
    239 #
    240 
    241 ifeq ($(CONFIG_KCONSOLE),y)
    242 GENERIC_SOURCES += \
    243         generic/src/console/kconsole.c \
    244         generic/src/console/cmd.c
    245 endif
    246 
    247 ## Udebug interface sources
    248 #
    249 
    250 ifeq ($(CONFIG_UDEBUG),y)
    251 GENERIC_SOURCES += \
    252         generic/src/ipc/kbox.c \
    253         generic/src/udebug/udebug.c \
    254         generic/src/udebug/udebug_ops.c \
    255         generic/src/udebug/udebug_ipc.c
    256 endif
    257 
    258 ## Test sources
    259 #
    260 
    261 ifeq ($(CONFIG_TEST),y)
    262         CFLAGS += -Itest/
    263         GENERIC_SOURCES += \
    264                 test/test.c \
    265                 test/atomic/atomic1.c \
    266                 test/btree/btree1.c \
    267                 test/avltree/avltree1.c \
    268                 test/fault/fault1.c \
    269                 test/mm/falloc1.c \
    270                 test/mm/falloc2.c \
    271                 test/mm/mapping1.c \
    272                 test/mm/slab1.c \
    273                 test/mm/slab2.c \
    274                 test/synch/rwlock1.c \
    275                 test/synch/rwlock2.c \
    276                 test/synch/rwlock3.c \
    277                 test/synch/rwlock4.c \
    278                 test/synch/rwlock5.c \
    279                 test/synch/semaphore1.c \
    280                 test/synch/semaphore2.c \
    281                 test/print/print1.c \
    282                 test/print/print2.c \
    283                 test/print/print3.c \
    284                 test/print/print4.c \
    285                 test/thread/thread1.c \
    286                 test/sysinfo/sysinfo1.c
    287        
    288         ifeq ($(KARCH),mips32)
    289                 GENERIC_SOURCES += test/debug/mips1.c
    290         else
    291                 GENERIC_SOURCES += test/debug/mips1_skip.c
    292         endif
    293        
    294         ifeq ($(KARCH),ia64)
    295                 GENERIC_SOURCES += test/mm/purge1.c
    296         else
    297                 GENERIC_SOURCES += test/mm/purge1_skip.c
    298         endif
    299        
    300         ifeq ($(CONFIG_FPU),y)
    301                 ifeq ($(KARCH),ia32)
    302                         TEST_FPU1 = y
    303                         TEST_SSE1 = y
    304                         GENERIC_SOURCES += test/fpu/fpu1_x86.c
    305                 endif
    306                
    307                 ifeq ($(KARCH),amd64)
    308                         TEST_FPU1 = y
    309                         TEST_SSE1 = y
    310                         GENERIC_SOURCES += test/fpu/fpu1_x86.c
    311                 endif
    312                
    313                 ifeq ($(KARCH),ia64)
    314                         TEST_FPU1 = y
    315                         GENERIC_SOURCES += test/fpu/fpu1_ia64.c
    316                 endif
    317                
    318                 ifeq ($(KARCH),mips32)
    319                         TEST_MIPS2 = y
    320                 endif
    321         endif
    322        
    323         ifneq ($(TEST_FPU1),y)
    324                 GENERIC_SOURCES += test/fpu/fpu1_skip.c
    325         endif
    326        
    327         ifeq ($(TEST_SSE1),y)
    328                 GENERIC_SOURCES += test/fpu/sse1.c
    329         else
    330                 GENERIC_SOURCES += test/fpu/sse1_skip.c
    331         endif
    332        
    333         ifeq ($(TEST_MIPS2),y)
    334                 GENERIC_SOURCES += test/fpu/mips2.c
    335         else
    336                 GENERIC_SOURCES += test/fpu/mips2_skip.c
    337         endif
    338        
    339 endif
    340 
    341 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
    342 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
    343 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
    344 
    345 ifeq ($(CONFIG_SYMTAB),y)
    346         SYMTAB_OBJECTS := generic/src/debug/real_map.o
    347 else
    348         SYMTAB_OBJECTS :=
    349 endif
    350 
    351 .PHONY: all build clean archlinks depend disasm
    352 
    353 all: ../Makefile.config ../config.h ../config.defs
    354         -rm Makefile.depend
    355         $(MAKE) -C . build
    356 
    357 build: kernel.bin disasm
    358 
    359 -include Makefile.depend
     33all: ../version ../Makefile.config ../config.h ../config.defs
     34        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     35        $(MAKE) -f Makefile.build
    36036
    36137clean:
    362         -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump kernel.disasm generic/src/debug/real_map.bin Makefile.depend* generic/include/arch generic/include/genarch arch/$(KARCH)/_link.ld
     38        rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld
    36339        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
    364         for arch in arch/* ; do \
    365             [ -e $$arch/_link.ld ] && rm $$arch/_link.ld 2>/dev/null ; \
    366         done ; exit 0
    367 
    368 archlinks:
    369         ln -sfn ../../arch/$(KARCH)/include/ generic/include/arch
    370         ln -sfn ../../genarch/include/ generic/include/genarch
    371 
    372 depend: archlinks
    373         -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
    374 
    375 arch/$(KARCH)/_link.ld: arch/$(KARCH)/_link.ld.in
    376         $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
    377 
    378 generic/src/debug/real_map.bin: depend arch/$(KARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
    379         echo $(SYMTAB_SECTION) | $(AS) $(AFLAGS) -o generic/src/debug/empty_map.o
    380         $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/empty_map.o  -o $@ -Map kernel.map.pre
    381         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
    382         tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin
    383         # Do it once again, this time to get correct even the symbols
    384         # on architectures, that have bss after symtab
    385         echo $(SYMTAB_SECTION)" .incbin \"$@\"" | $(AS) $(AFLAGS) -o generic/src/debug/sizeok_map.o
    386         $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
    387         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
    388         tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin
    389 
    390 generic/src/debug/real_map.o: generic/src/debug/real_map.bin
    391         echo $(SYMTAB_SECTION)" .incbin \"$<\"" | $(AS) $(AFLAGS) -o $@
    392 
    393 kernel.raw: depend arch/$(KARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(SYMTAB_OBJECTS)
    394         $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS) -o $@ -Map kernel.map
    395 
    396 kernel.bin: kernel.raw
    397         $(OBJCOPY) -O $(BFD) kernel.raw kernel.bin
    398 
    399 disasm: kernel.raw
    400         $(OBJDUMP) -d kernel.raw > kernel.disasm
    401 
    402 %.o: %.S
    403         $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
    404 
    405 %.o: %.s
    406         $(AS) $(AFLAGS) $< -o $@
    407 
    408 #
    409 # The FPU tests are the only objects for which we allow the compiler to generate
    410 # FPU instructions.
    411 #
    412 test/fpu/%.o: test/fpu/%.c
    413         $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c $< -o $@
    414 
    415 #
    416 # Ordinary objects.
    417 #
    418 %.o: %.c
    419         $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c $< -o $@

  • kernel/arch/amd64/include/mm/page.h

    r5f678b1c r5a4fef9  
    177177#define PFERR_CODE_ID           (1 << 4)
    178178
    179 static inline int get_pt_flags(pte_t *pt, size_t i)
     179static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
    180180{
    181181        pte_t *p = &pt[i];

  • kernel/arch/amd64/src/cpu/cpu.c

    r5f678b1c r5a4fef9  
    130130        CPU->arch.vendor = VendorUnknown;
    131131        if (has_cpuid()) {
    132                 cpuid(0, &info);
     132                cpuid(INTEL_CPUID_LEVEL, &info);
    133133
    134134                /*
    … …  
    150150                }
    151151                               
    152                 cpuid(1, &info);
     152                cpuid(INTEL_CPUID_STANDARD, &info);
    153153                CPU->arch.family = (info.cpuid_eax >> 8) & 0xf;
    154154                CPU->arch.model = (info.cpuid_eax >> 4) & 0xf;

  • kernel/arch/ia32/include/cpu.h

    r5f678b1c r5a4fef9  
    5050#include <arch/pm.h>
    5151#include <arch/asm.h>
     52#include <arch/cpuid.h>
    5253
    5354typedef struct {
    … …  
    5657        unsigned int model;
    5758        unsigned int stepping;
     59        cpuid_feature_info fi;
     60
    5861        tss_t *tss;
    5962       

  • kernel/arch/ia32/include/cpuid.h

    r5f678b1c r5a4fef9  
    6363
    6464struct __cpuid_feature_info {
    65         unsigned                        : 23;
     65        unsigned      : 11;
     66        unsigned sep  :  1;
     67        unsigned      : 11;
    6668        unsigned mmx  :  1;
    6769        unsigned fxsr :  1;

  • kernel/arch/ia32/include/mm/page.h

    r5f678b1c r5a4fef9  
    146146#define PFERR_CODE_RSVD         (1 << 3)       
    147147
    148 static inline int get_pt_flags(pte_t *pt, size_t i)
     148static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
    149149{
    150150        pte_t *p = &pt[i];

  • kernel/arch/ia32/src/boot/boot.S

    r5f678b1c r5a4fef9  
    8585        pse_supported:
    8686       
    87         bt $(INTEL_SEP), %edx
    88         jc sep_supported
    89        
    90                 movl $sep_msg, %esi
    91                 jmp error_halt
    92        
    93         sep_supported:
    94 
    9587#include "vesa_prot.inc"
    9688
    … …  
    225217        .asciz "Page Size Extension not supported. System halted."
    226218
    227 sep_msg:
    228         .asciz "SYSENTER/SYSEXIT not supported. System halted."

  • kernel/arch/ia32/src/cpu/cpu.c

    r5f678b1c r5a4fef9  
    9292void cpu_arch_init(void)
    9393{
    94         cpuid_feature_info fi;
    9594        cpuid_extended_feature_info efi;
    9695        cpu_info_t info;
    … …  
    102101        CPU->fpu_owner = NULL;
    103102       
    104         cpuid(1, &info);
     103        cpuid(INTEL_CPUID_STANDARD, &info);
    105104       
    106         fi.word = info.cpuid_edx;
     105        CPU->arch.fi.word = info.cpuid_edx;
    107106        efi.word = info.cpuid_ecx;
    108107       
    109         if (fi.bits.fxsr)
     108        if (CPU->arch.fi.bits.fxsr)
    110109                fpu_fxsr();
    111110        else
    112111                fpu_fsr();
    113112       
    114         if (fi.bits.sse) {
     113        if (CPU->arch.fi.bits.sse) {
    115114                asm volatile (
    116115                        "mov %%cr4, %[help]\n"
    … …  
    122121        }
    123122       
    124         /* Setup fast SYSENTER/SYSEXIT syscalls */
    125         syscall_setup_cpu();
     123        if (CPU->arch.fi.bits.sep) {
     124                /* Setup fast SYSENTER/SYSEXIT syscalls */
     125                syscall_setup_cpu();
     126        }
    126127}
    127128
    … …  
    132133        CPU->arch.vendor = VendorUnknown;
    133134        if (has_cpuid()) {
    134                 cpuid(0, &info);
     135                cpuid(INTEL_CPUID_LEVEL, &info);
    135136
    136137                /*
    … …  
    150151                        CPU->arch.vendor = VendorIntel;
    151152               
    152                 cpuid(1, &info);
     153                cpuid(INTEL_CPUID_STANDARD, &info);
    153154                CPU->arch.family = (info.cpuid_eax >> 8) & 0x0f;
    154155                CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f;

  • kernel/arch/ia32/src/proc/scheduler.c

    r5f678b1c r5a4fef9  
    6161            SP_DELTA];
    6262       
    63         /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
    64         write_msr(IA32_MSR_SYSENTER_ESP, kstk);
     63        if (CPU->arch.fi.bits.sep) {
     64                /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
     65                write_msr(IA32_MSR_SYSENTER_ESP, kstk);
     66        }
    6567       
    6668        /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */

  • kernel/arch/ia32/src/userspace.c

    r5f678b1c r5a4fef9  
    7070                "movl %[uarg], %%eax\n"
    7171               
    72                 /* %ebx is defined to hold pcb_ptr - set it to 0 */
    73                 "xorl %%ebx, %%ebx\n"
     72                /* %edi is defined to hold pcb_ptr - set it to 0 */
     73                "xorl %%edi, %%edi\n"
    7474               
    7575                "iret\n"

  • kernel/arch/mips32/include/mm/page.h

    r5f678b1c r5a4fef9  
    141141#include <arch/exception.h>
    142142
    143 static inline int get_pt_flags(pte_t *pt, size_t i)
     143static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
    144144{
    145145        pte_t *p = &pt[i];

  • kernel/arch/ppc32/include/mm/page.h

    r5f678b1c r5a4fef9  
    131131#include <arch/interrupt.h>
    132132
    133 static inline int get_pt_flags(pte_t *pt, size_t i)
     133static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
    134134{
    135135        pte_t *p = &pt[i];

  • kernel/generic/include/context.h

    r5f678b1c r5a4fef9  
    5151/** Save register context.
    5252 *
    53  * Save current register context (including stack pointers)
    54  * to context structure.
    55  *
    56  * Note that call to context_restore() will return at the same
     53 * Save the current register context (including stack pointer) to a context
     54 * structure. A subsequent call to context_restore() will return to the same
    5755 * address as the corresponding call to context_save().
    5856 *
    59  * This MUST be a macro, gcc -O0 does not inline functions even
    60  * if they are marked inline and context_save_arch must be called
    61  * from level <= that when context_restore is called.
     57 * Note that context_save_arch() must reuse the stack frame of the function
     58 * which called context_save(). We guarantee this by:
    6259 *
    63  * @param c Context structure.
     60 *   a) implementing context_save_arch() in assembly so that it does not create
     61 *      its own stack frame, and by
     62 *   b) defining context_save() as a macro because the inline keyword is just a
     63 *      hint for the compiler, not a real constraint; the application of a macro
     64 *      will definitely not create a stack frame either.
    6465 *
    65  * @return context_save() returns 1, context_restore() returns 0.
     66 * To imagine what could happen if there were some extra stack frames created
     67 * either by context_save() or context_save_arch(), we need to realize that the
     68 * sp saved in the contex_t structure points to the current stack frame as it
     69 * existed when context_save_arch() was executing. After the return from
     70 * context_save_arch() and context_save(), any extra stack frames created by
     71 * these functions will be destroyed and their contents sooner or later
     72 * overwritten by functions called next. Any attempt to restore to a context
     73 * saved like that would therefore lead to a disaster.
     74 *
     75 * @param c             Context structure.
     76 *
     77 * @return              context_save() returns 1, context_restore() returns 0.
    6678 */
    6779#define context_save(c)   context_save_arch(c)
    … …  
    6981/** Restore register context.
    7082 *
    71  * Restore previously saved register context (including stack pointers)
    72  * from context structure.
     83 * Restore a previously saved register context (including stack pointer) from
     84 * a context structure.
    7385 *
    74  * Note that this function does not normally return.
    75  * Instead, it returns at the same address as the
    76  * corresponding call to context_save(), the only
    77  * difference being return value.
     86 * Note that this function does not normally return.  Instead, it returns to the
     87 * same address as the corresponding call to context_save(), the only difference
     88 * being return value.
    7889 *
    79  * @param c Context structure.
     90 * @param c             Context structure.
    8091 */
    8192static inline void context_restore(context_t *c)

  • kernel/generic/src/console/cmd.c

    r5f678b1c r5a4fef9  
    409409};
    410410
     411/* Data and methods for 'kill' command */
     412static int cmd_kill(cmd_arg_t *argv);
     413static cmd_arg_t kill_argv = {
     414        .type = ARG_TYPE_INT,
     415};
     416static cmd_info_t kill_info = {
     417        .name = "kill",
     418        .description = "kill <taskid> Kill a task.",
     419        .func = cmd_kill,
     420        .argc = 1,
     421        .argv = &kill_argv
     422};
     423
    411424/* Data and methods for 'zone' command */
    412425static int cmd_zone(cmd_arg_t *argv);
    … …  
    459472        &help_info,
    460473        &ipc_info,
     474        &kill_info,
    461475        &set4_info,
    462476        &slabs_info,
    … …  
    848862 * @return Always 1
    849863 */
    850 int cmd_slabs(cmd_arg_t * argv) {
     864int cmd_slabs(cmd_arg_t * argv)
     865{
    851866        slab_print_list();
    852867        return 1;
    … …  
    860875 * @return Always 1
    861876 */
    862 int cmd_threads(cmd_arg_t * argv) {
     877int cmd_threads(cmd_arg_t * argv)
     878{
    863879        thread_print_list();
    864880        return 1;
    … …  
    871887 * @return Always 1
    872888 */
    873 int cmd_tasks(cmd_arg_t * argv) {
     889int cmd_tasks(cmd_arg_t * argv)
     890{
    874891        task_print_list();
    875892        return 1;
    … …  
    882899 * @return Always 1
    883900 */
    884 int cmd_sched(cmd_arg_t * argv) {
     901int cmd_sched(cmd_arg_t * argv)
     902{
    885903        sched_print_list();
    886904        return 1;
    … …  
    893911 * return Always 1
    894912 */
    895 int cmd_zones(cmd_arg_t * argv) {
     913int cmd_zones(cmd_arg_t * argv)
     914{
    896915        zone_print_list();
    897916        return 1;
    … …  
    904923 * return Always 1
    905924 */
    906 int cmd_zone(cmd_arg_t * argv) {
     925int cmd_zone(cmd_arg_t * argv)
     926{
    907927        zone_print_one(argv[0].intval);
    908928        return 1;
    … …  
    915935 * return Always 1
    916936 */
    917 int cmd_ipc(cmd_arg_t * argv) {
     937int cmd_ipc(cmd_arg_t * argv)
     938{
    918939        ipc_print_task(argv[0].intval);
    919940        return 1;
    920941}
    921942
     943/** Command for killing a task
     944 *
     945 * @param argv Integer argument from cmdline expected
     946 *
     947 * return 0 on failure, 1 on success.
     948 */
     949int cmd_kill(cmd_arg_t * argv)
     950{
     951        if (task_kill(argv[0].intval) != EOK)
     952                return 0;
     953
     954        return 1;
     955}
    922956
    923957/** Command for listing processors.

  • kernel/generic/src/console/console.c

    r5f678b1c r5a4fef9  
    319319       
    320320        if (size > PAGE_SIZE)
    321                 return ELIMIT;
     321                return (unative_t) ELIMIT;
    322322       
    323323        if (size > 0) {
    324324                data = (char *) malloc(size + 1, 0);
    325325                if (!data)
    326                         return ENOMEM;
     326                        return (unative_t) ENOMEM;
    327327               
    328328                rc = copy_from_uspace(data, buf, size);
    329329                if (rc) {
    330330                        free(data);
    331                         return rc;
     331                        return (unative_t) rc;
    332332                }
    333333                data[size] = 0;

  • kernel/generic/src/ipc/kbox.c

    r5f678b1c r5a4fef9  
    137137                /* Only detach kbox thread unless already terminating. */
    138138                mutex_lock(&TASK->kb.cleanup_lock);
    139                 if (&TASK->kb.finished == false) {
     139                if (TASK->kb.finished == false) {
    140140                        /* Detach kbox thread so it gets freed from memory. */
    141141                        thread_detach(TASK->kb.thread);
Note: See TracChangeset for help on using the changeset viewer.