Changeset 0aa06cbe in mainline for kernel


Ignore:
Timestamp:
2018-03-06T20:48:12Z (8 years ago)
Author:
GitHub <noreply@…>
Parents:
fd57cf17 (diff), 0c793e2 (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.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-06 20:48:12)
git-committer:
GitHub <noreply@…> (2018-03-06 20:48:12)
Message:

Merge 0c793e2e9c4358a2bb2521d35eb36b273cf0283b into fd57cf17d12bbe3b41626a0b8708f075134a073e

Location:
kernel
Files:
13 added
13 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    rfd57cf17 r0aa06cbe  
    4848#
    4949
    50 AGDEPEND = Makefile.ag.depend
     50AUTOGEN = $(ROOT_PATH)/tools/autogen2.sh
    5151RAW = kernel.raw
    5252BIN = kernel.bin
    … …  
    7373
    7474.PHONY: all clean autogen_clean depend
     75.DELETE_ON_ERROR:
    7576
    7677all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(BIN) $(DISASM)
    … …  
    132133-include arch/$(KARCH)/Makefile.inc
    133134-include genarch/Makefile.inc
    134 -include $(AGDEPEND)
    135135
    136136## The at-sign
    … …  
    354354GENARCH_DEPENDS := $(addsuffix .d,$(basename $(GENARCH_SOURCES)))
    355355
    356 GENARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(GENARCH_AUTOGENS_AG)))
    357 GENARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(GENARCH_AUTOGENS_AG)))
    358 GENARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(GENARCH_AUTOGENS_AG)))
    359 
    360 ARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(ARCH_AUTOGENS_AG)))
    361 ARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(ARCH_AUTOGENS_AG)))
    362 ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
    363 
    364 AUTOGENS_H := $(ARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_H)
    365356AUTOGENS_AG := $(ARCH_AUTOGENS_AG) $(GENARCH_AUTOGENS_AG)
     357AUTOGEN_DEPENDS := $(addsuffix .d,$(AUTOGENS_AG))
    366358
    367359AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
    … …  
    371363-include $(ARCH_DEPENDS)
    372364-include $(GENARCH_DEPENDS)
     365-include $(AUTOGEN_DEPENDS)
    373366
    374367ifeq ($(COMPILER),clang)
    … …  
    402395        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
    403396
    404 %.h: %.ag
    405         $(AUTOGEN) probe $< >$<.probe.c
    406         $(CC_AUTOGEN) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
    407         $(AUTOGEN) generate $< <$<.probe.s >$@
     397%.ag.h %.ag.s %.ag.c %.ag.d: %.h
     398        CC="$(CC)" CFLAGS="-DKERNEL $(CFLAGS)" $(AUTOGEN) $< $@
    408399
    409400%.o: %.S | depend
    … …  
    441432        $(GENMAP) $(MAP_PREV) $(DUMP) $@
    442433
    443 $(AUTOGENS_H): $(AGDEPEND)
    444 
    445 $(AGDEPEND): $(AUTOGENS_AG)
    446         echo "# DO NOT EDIT" >$@
    447         for g in $^; do \
    448                 h=`dirname $$g`/`basename $$g .ag`.h; \
    449                 for l in `$(AUTOGEN) depend $$g`; do \
    450                         echo "$$h: $$l" >>$@; \
    451                 done \
    452         done
    453 
    454 depend: $(AUTOGENS_H)
     434depend: $(AUTOGENS_AG)
    455435
    456436autogen_clean:
    457         -rm $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
    458         -rm $(GENARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_PROBE_C) $(GENARCH_AUTOGENS_PROBE_S)
    459         -rm $(AGDEPEND)
     437        -rm $(AUTOGENS_AG) $(AUTOGEN_DEPENDS) $(AUTOGENS_AG)

  • kernel/arch/amd64/Makefile.inc

    rfd57cf17 r0aa06cbe  
    8686
    8787ARCH_AUTOGENS_AG = \
    88         arch/$(KARCH)/include/arch/istate_struct.ag \
    89         arch/$(KARCH)/include/arch/context_struct.ag \
    90         arch/$(KARCH)/include/arch/kseg_struct.ag \
    91         arch/$(KARCH)/include/arch/boot/memmap_struct.ag
     88        arch/$(KARCH)/include/arch/istate_struct.ag.h \
     89        arch/$(KARCH)/include/arch/context_struct.ag.h \
     90        arch/$(KARCH)/include/arch/kseg_struct.ag.h \
     91        arch/$(KARCH)/include/arch/boot/memmap_struct.ag.h

  • kernel/arch/amd64/src/asm.S

    rfd57cf17 r0aa06cbe  
    3030#include <arch/pm.h>
    3131#include <arch/mm/page.h>
    32 #include <arch/istate_struct.h>
    33 #include <arch/kseg_struct.h>
     32#include <arch/istate_struct.ag.h>
     33#include <arch/kseg_struct.ag.h>
    3434#include <arch/cpu.h>
    3535#include <arch/smp/apic.h>
    … …  
    541541        ret
    542542FUNCTION_END(early_putchar)
     543

  • kernel/arch/amd64/src/boot/multiboot.S

    rfd57cf17 r0aa06cbe  
    720720status_main:
    721721        .asciz "[main] "
     722

  • kernel/arch/amd64/src/context.S

    rfd57cf17 r0aa06cbe  
    2828
    2929#include <abi/asmtool.h>
    30 #include <arch/context_struct.h>
     30#include <arch/context_struct.ag.h>
    3131#include <arch/vreg.h>
    3232

  • kernel/arch/amd64/src/smp/ap.S

    rfd57cf17 r0aa06cbe  
    3939#include <arch/cpu.h>
    4040#include <arch/cpuid.h>
    41 #include <arch/context_struct.h>
     41#include <arch/context_struct.ag.h>
    4242
    4343.section K_TEXT_START, "ax"

  • kernel/arch/arm32/Makefile.inc

    rfd57cf17 r0aa06cbe  
    9696        ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c
    9797endif
    98 
    99 ARCH_AUTOGENS_AG = \
    100         arch/$(KARCH)/include/arch/istate_struct.ag \
    101         arch/$(KARCH)/include/arch/context_struct.ag
    102 

  • kernel/arch/ia32/Makefile.inc

    rfd57cf17 r0aa06cbe  
    103103
    104104ARCH_AUTOGENS_AG = \
    105         arch/$(KARCH)/include/arch/istate_struct.ag \
    106         arch/$(KARCH)/include/arch/context_struct.ag \
    107         arch/$(KARCH)/include/arch/boot/memmap_struct.ag
     105        arch/$(KARCH)/include/arch/istate_struct.ag.h \
     106        arch/$(KARCH)/include/arch/context_struct.ag.h \
     107        arch/$(KARCH)/include/arch/boot/memmap_struct.ag.h
    108108

  • kernel/arch/ia32/include/arch/boot/memmap.h

    rfd57cf17 r0aa06cbe  
    3636#define KERN_ia32_MEMMAP_H_
    3737
    38 #include <arch/boot/memmap_struct.h>
     38
    3939
    4040/* E820h memory range types */
    … …  
    6161#define MEMMAP_E820_MAX_RECORDS  32
    6262
    63 #ifndef __ASM__
     63#ifdef __ASM__
     64
     65#include <arch/boot/memmap_struct.ag.h>
     66
     67#else
    6468
    6569#include <stdint.h>
     70#include <arch/boot/memmap_struct.h>
    6671
    6772extern e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];

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

    rfd57cf17 r0aa06cbe  
    3535#include <arch/cpu.h>
    3636#include <arch/mm/page.h>
    37 #include <arch/istate_struct.h>
     37#include <arch/istate_struct.ag.h>
    3838#include <arch/smp/apic.h>
    3939
    … …  
    585585FUNCTION_END(early_putchar)
    586586
     587

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

    rfd57cf17 r0aa06cbe  
    2828
    2929#include <abi/asmtool.h>
    30 #include <arch/context_struct.h>
     30#include <arch/context_struct.ag.h>
    3131#include <arch/vreg.h>
    3232

  • kernel/arch/ia32/src/smp/ap.S

    rfd57cf17 r0aa06cbe  
    3838#include <arch/pm.h>
    3939#include <arch/cpu.h>
    40 #include <arch/context_struct.h>
     40#include <arch/context_struct.ag.h>
    4141
    4242.section K_TEXT_START, "ax"

  • kernel/arch/ia64/Makefile.inc

    rfd57cf17 r0aa06cbe  
    7373
    7474ARCH_AUTOGENS_AG = \
    75         arch/$(KARCH)/include/arch/istate_struct.ag \
    76         arch/$(KARCH)/include/arch/context_struct.ag
     75        arch/$(KARCH)/include/arch/istate_struct.ag.h \
     76        arch/$(KARCH)/include/arch/context_struct.ag.h
    7777

  • kernel/arch/ia64/include/arch/interrupt.h

    rfd57cf17 r0aa06cbe  
    3737
    3838#ifndef __ASM__
     39#include <_bits/native.h>
    3940#include <arch/istate.h>
    4041#include <stdint.h>

  • kernel/arch/ia64/src/context.S

    rfd57cf17 r0aa06cbe  
    2828
    2929#include <abi/asmtool.h>
    30 #include <arch/context_struct.h>
     30#include <arch/context_struct.ag.h>
    3131
    3232.text

  • kernel/arch/ia64/src/ivt.S

    rfd57cf17 r0aa06cbe  
    3333#include <arch/mm/page.h>
    3434#include <arch/interrupt.h>
    35 #include <arch/istate_struct.h>
     35#include <arch/istate_struct.ag.h>
    3636#include <align.h>
    3737

  • kernel/arch/mips32/Makefile.inc

    rfd57cf17 r0aa06cbe  
    8989
    9090ARCH_AUTOGENS_AG = \
    91         arch/$(KARCH)/include/arch/istate_struct.ag \
    92         arch/$(KARCH)/include/arch/context_struct.ag \
    93         arch/$(KARCH)/include/arch/fpu_context_struct.ag
     91        arch/$(KARCH)/include/arch/istate_struct.ag.h \
     92        arch/$(KARCH)/include/arch/context_struct.ag.h \
     93        arch/$(KARCH)/include/arch/fpu_context_struct.ag.h

  • kernel/arch/ppc32/Makefile.inc

    rfd57cf17 r0aa06cbe  
    6060
    6161ARCH_AUTOGENS_AG = \
    62         arch/$(KARCH)/include/arch/istate_struct.ag \
    63         arch/$(KARCH)/include/arch/context_struct.ag \
    64         arch/$(KARCH)/include/arch/fpu_context_struct.ag
     62        arch/$(KARCH)/include/arch/istate_struct.ag.h \
     63        arch/$(KARCH)/include/arch/context_struct.ag.h \
     64        arch/$(KARCH)/include/arch/fpu_context_struct.ag.h
    6565

  • kernel/arch/riscv64/Makefile.inc

    rfd57cf17 r0aa06cbe  
    5555
    5656ARCH_AUTOGENS_AG = \
    57         arch/$(KARCH)/include/arch/istate_struct.ag \
    58         arch/$(KARCH)/include/arch/context_struct.ag
     57        arch/$(KARCH)/include/arch/istate_struct.ag.h \
     58        arch/$(KARCH)/include/arch/context_struct.ag.h

  • kernel/arch/sparc64/Makefile.inc

    rfd57cf17 r0aa06cbe  
    111111
    112112ARCH_AUTOGENS_AG = \
    113         arch/$(KARCH)/include/arch/istate_struct.ag \
    114         arch/$(KARCH)/include/arch/context_struct.ag
     113        arch/$(KARCH)/include/arch/istate_struct.ag.h \
     114        arch/$(KARCH)/include/arch/context_struct.ag.h
    115115

  • kernel/genarch/Makefile.inc

    rfd57cf17 r0aa06cbe  
    173173        genarch/src/multiboot/multiboot2.c
    174174GENARCH_AUTOGENS_AG += \
    175         genarch/include/genarch/multiboot/multiboot_memmap_struct.ag \
    176         genarch/include/genarch/multiboot/multiboot_info_struct.ag
     175        genarch/include/genarch/multiboot/multiboot_memmap_struct.ag.h \
     176        genarch/include/genarch/multiboot/multiboot_info_struct.ag.h
    177177endif
    178178

  • kernel/genarch/include/genarch/multiboot/multiboot.h

    rfd57cf17 r0aa06cbe  
    3636#define KERN_MULTIBOOT_H_
    3737
    38 #include <genarch/multiboot/multiboot_memmap_struct.h>
    39 #include <genarch/multiboot/multiboot_info_struct.h>
    4038
    4139#define MULTIBOOT_HEADER_MAGIC  0x1badb002
    … …  
    5250#define MULTIBOOT_INFO_FLAGS_MMAP       0x40
    5351
    54 #ifndef __ASM__
     52#ifdef __ASM__
     53
     54#include <genarch/multiboot/multiboot_memmap_struct.ag.h>
     55#include <genarch/multiboot/multiboot_info_struct.ag.h>
     56
     57#else
     58
     59#include <genarch/multiboot/multiboot_memmap_struct.h>
     60#include <genarch/multiboot/multiboot_info_struct.h>
    5561
    5662#include <typedefs.h>
Note: See TracChangeset for help on using the changeset viewer.