Changeset 27 for trunk


Ignore:
Timestamp:
Jun 19, 2017, 8:13:59 PM (8 years ago)
Author:
max@…
Message:

cosmetic

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.x86

    r26 r27  
    11#############################################################################
    2 #                                               ALMOS-MKH  Makefile for x86_64                      #
     2#                       ALMOS-MKH  Makefile for x86_64                      #
    33#############################################################################
    44
    … …  
    1010
    1111# Export all variables to applications sub-Makefile.
    12 export 
     12export
    1313CC = gcc
    1414AS = as
    … …  
    1818
    1919
    20 # Rules that don't build target files 
     20# Rules that don't build target files
    2121# always out-of-date, need to be regenerated everytime they are called
    2222.PHONY: compile                         \
    … …  
    2929                build/kernel/kernel.elf
    3030
    31 # Objects to be linked for the soclib drivers library 
     31# Objects to be linked for the soclib drivers library
    3232DRIVERS_OBJS = build/kernel/drivers/soclib_tty.o  \
    3333               build/kernel/drivers/soclib_bdv.o  \
    … …  
    4040               build/kernel/drivers/soclib_iob.o
    4141
    42 # Objects to be linked for kernel.elf generation 
     42# Objects to be linked for kernel.elf generation
    4343KERN_OBJS       = build/kernel/kern/kernel_init.o     \
    4444              build/kernel/kern/printk.o          \
    … …  
    7878              build/kernel/devices/dev_dma.o      \
    7979              build/kernel/devices/dev_fbf.o      \
    80               build/kernel/devices/dev_iob.o 
     80              build/kernel/devices/dev_iob.o
    8181
    8282MM_OBJS     = build/kernel/mm/ppm.o               \
    … …  
    139139              build/kernel/syscalls/sys_clock.o           \
    140140              build/kernel/syscalls/sys_alarm.o           \
    141               build/kernel/syscalls/sys_rmdir.o   
     141              build/kernel/syscalls/sys_rmdir.o
    142142
    143143SYS_OBJS_3  = build/kernel/syscalls/sys_utls.o            \
    … …  
    150150              build/kernel/syscalls/sys_exec.o            \
    151151              build/kernel/syscalls/sys_stat.o            \
    152               build/kernel/syscalls/sys_trace.o         
     152              build/kernel/syscalls/sys_trace.o
    153153
    154154SYS_OBJS_4  = build/kernel/syscalls/sys_madvise.o         \
    … …  
    163163              build/kernel/syscalls/sys_gettimeofday.o
    164164
    165 SYS_OBJS_5  = build/kernel/syscalls/sys_times.o 
     165SYS_OBJS_5  = build/kernel/syscalls/sys_times.o
    166166
    167167
    … …  
    172172
    173173# List of directories to be searched for included files
    174 # when compiling for kernel.elf generation 
     174# when compiling for kernel.elf generation
    175175KERNEL_INCLUDE = -Ikernel                \
    176176                 -Ikernel/kern           \
    … …  
    200200# The Mtools used to build the FAT32 disk image perfom a few sanity checks, to
    201201# make sure that the disk is indeed an MS-DOS disk. However, the size of the
    202 # disk image used by ALMOS-VM is not MS-DOS compliant. 
     202# disk image used by ALMOS-VM is not MS-DOS compliant.
    203203# Setting this variable prevents these checks.
    204204MTOOLS_SKIP_CHECK := 1
    … …  
    219219        @mkdir -p build/kernel/libk
    220220        @mkdir -p build/kernel/drivers
    221         @mkdir -p build/kernel/vfs 
     221        @mkdir -p build/kernel/vfs
    222222        @mkdir -p build/kernel/syscalls
    223223        @mkdir -p hdd
    … …  
    232232
    233233##############################################################
    234 # Rule to copy the files generated by the virtual prototype 
     234# Rule to copy the files generated by the virtual prototype
    235235# from the virtual disk 'home' directory to the current directory.
    236236extract:
    237237        mcopy -o -i $(DISK_IMAGE) ::/home .
    238238
    239 # Rules to delete all binary files from Unix File System 
     239# Rules to delete all binary files from Unix File System
    240240# without modifying the virtual disk.
    241241clean:
    … …  
    267267
    268268##############################
    269 # rules to compile the drivers 
     269# rules to compile the drivers
    270270build/kernel/drivers/%.o:       kernel/drivers/soclib/%.c   \
    271271                                kernel/drivers/soclib/%.h   \
    … …  
    365365                                $(SYS_OBJS_2)               \
    366366                                $(SYS_OBJS_3)               \
    367                                                                 kernel/kernel_x86.ld         
    368         $(LD) -o $@ -z max-page-size=0x1000 -T kernel/kernel_x86.ld                     \
     367                                                                kernel/kernel_x86.ld
     368        $(LD) -o $@ -z max-page-size=0x1000 -T kernel/kernel_x86.ld  \
    369369          $(KERN_OBJS) $(HAL_OBJS) $(DEV_OBJS) $(MM_OBJS)   \
    370370          $(LIBK_OBJS) $(DRIVERS_OBJS) $(VFS_OBJS)          \
    371371          $(SYS_OBJS_0) $(SYS_OBJS_1) $(SYS_OBJS_2)         \
    372372          $(SYS_OBJS_3)
    373          
     373
    374374
    375375#   $(SYS_OBJS_4) $(SYS_OBJS_5)
    376          
     376
    377377        $(DU) -D $@ > $@.txt
    378378        mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel

  • trunk/kernel/kernel.ld

    r14 r27  
    1 /**********************************************************************************************
    2  * This is the linker script for the ALMOS-MK kernel.
     1/*******************************************************************************
     2 * This is the linker script for the ALMOS-MKH TSAR kernel.
    33 * It describes the memory layout for the "kernel.elf" binary file.
    4  *********************************************************************************************/
     4 ******************************************************************************/
    55
    6 /* define the kernel code base address */
    7 
     6/* Define the kernel code base address */
    87kernel_base = 0x4000;
    98
    10 /* Set the entry point of the boot-loader (e_entry field in the "boot.elf" file header) */
     9/*
     10 * Set the entry point of the boot-loader (e_entry field in the "boot.elf"
     11 * file header)
     12 */
    1113
    1214ENTRY(kernel_init)
    1315
    14 /* Describe how to group the sections */
    15 
     16/*
     17 * Describe how to group the sections
     18 */
    1619SECTIONS
    1720{
    18     . = kernel_base;
    19     seg_kcode :
    20     {
    21         *(.text)
    22         *(.rodata*)
    23     }
    24     . = ALIGN(0x1000);
    25     seg_kdata :
    26     {
    27         *(.kinfo)
    28         *(.kidle)
    29         *(.kdata*)
    30         *(.data*)
    31     }
     21        . = kernel_base;
     22        seg_kcode :
     23        {
     24                *(.text)
     25                *(.rodata*)
     26        }
     27
     28        . = ALIGN(0x1000);
     29
     30        seg_kdata :
     31        {
     32                *(.kinfo)
     33                *(.kidle)
     34                *(.kdata*)
     35                *(.data*)
     36        }
    3237}

  • trunk/kernel/kernel_x86.ld

    r26 r27  
    11/*******************************************************************************
    2  * This is the linker script for the ALMOS-MKH kernel.
     2 * This is the linker script for the ALMOS-MKH x86_64 kernel.
    33 * It describes the memory layout for the "kernel.elf" binary file.
    44 ******************************************************************************/
Note: See TracChangeset for help on using the changeset viewer.