os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

egypt update

This commit is contained in:
Julian Barathieu 2019-05-27 20:45:05 +02:00
parent 691e992c38
commit ebb1a4e927
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -41,7 +41,7 @@ LDFLAGS=-melf_x86_64
COPTIM=-O2 COPTIM=-O2
CWARNS=-Wall -Wextra -Wno-unused-parameter -Wno-implicit-fallthrough -Werror=implicit-function-declaration -Werror=return-type CWARNS=-Wall -Wextra -Wno-unused-parameter -Wno-implicit-fallthrough -Werror=implicit-function-declaration -Werror=return-type
CINCLUDES=-Iinclude CINCLUDES=-Iinclude
CFLAGS1=-nostdlib -ffreestanding -mcmodel=large -std=gnu11 -fdump-rtl-expand CFLAGS1=-nostdlib -ffreestanding -mcmodel=large -std=gnu11 -fstack-protector-all -fdump-rtl-expand
CFLAGS2= -c -mno-red-zone -mno-mmx -mno-sse -mno-sse2 CFLAGS2= -c -mno-red-zone -mno-mmx -mno-sse -mno-sse2
CFLAGS= $(CFLAGS1) $(CFLAGS2) CFLAGS= $(CFLAGS1) $(CFLAGS2)
CFLAGS_MATHS= $(CFLAGS1) -c -mno-red-zone -mno-mmx -mno-sse2 CFLAGS_MATHS= $(CFLAGS1) -c -mno-red-zone -mno-mmx -mno-sse2
@ -55,10 +55,10 @@ CFLAGS += -g
endif endif
KCC=$(CCNAME) $(COPTIM) $(CWARNS) $(CFLAGS) $(CINCLUDES) \ KCC=$(CCNAME) $(COPTIM) $(CWARNS) $(CFLAGS) $(CINCLUDES) \
-D_OSK_SOURCE -D_KALEID_KERNEL -fstack-protector-all -D_OSK_SOURCE -D_KALEID_KERNEL
KCC_MATHS=$(CCNAME) $(COPTIM) $(CWARNS) $(CFLAGS_MATHS) $(CINCLUDES) \ KCC_MATHS=$(CCNAME) $(COPTIM) $(CWARNS) $(CFLAGS_MATHS) $(CINCLUDES) \
-D_OSK_SOURCE -D_KALEID_KERNEL -fstack-protector-all -D_OSK_SOURCE -D_KALEID_KERNEL
# Folders # Folders
MBRDIR=boot/grub MBRDIR=boot/grub
@ -259,11 +259,12 @@ copy_kernel:
@echo ${CL2}[$@] ${CL}Success.${CL3} @echo ${CL2}[$@] ${CL}Success.${CL3}
@rmdir $(BINDIR)/disk @rmdir $(BINDIR)/disk
egypt: egypt: CFLAGS := -DNDEBUG $(filter-out -fstack-protector-all,$(CFLAGS))
egypt: dust $(LibCObj) $(KernObj)
@find -name '*.expand' -o -name '*.expand' | xargs cat > rtl_exp.out @find -name '*.expand' -o -name '*.expand' | xargs cat > rtl_exp.out
@egypt < rtl_exp.out | dot -Tps -o osk-graph.ps @egypt < rtl_exp.out | dot -Tps -o osk-graph.ps
@rm -f rtl_exp.out @rm -f rtl_exp.out
@evince osk-graph.ps @evince osk-graph.ps &
dust: dust:
-@$(MBRDIR)/umount.sh $(BINDIR)/disk || /bin/true -@$(MBRDIR)/umount.sh $(BINDIR)/disk || /bin/true

3
ProjectTree
View File

@ -302,7 +302,8 @@
├── ChangeLog ├── ChangeLog
├── COPYING ├── COPYING
├── Makefile ├── Makefile
├── osk-graph.ps
├── ProjectTree ├── ProjectTree
└── README.md └── README.md
43 directories, 237 files 43 directories, 238 files

2
include/ke/cpuid.h
View File

@ -115,7 +115,7 @@ static inline int CpuCpuidString(int code, uint where[4])
void KeGetCpuInfos(void); void KeGetCpuInfos(void);
double KeGetCpuSpeed(void); double KeGetCpuSpeed(void);
extern void KeActivateSSE(void); void KeActivateSSE(void);
// -------------------------------------------------------------------------- // // -------------------------------------------------------------------------- //

2
include/kernel.h
View File

@ -186,7 +186,7 @@ extern CpuCore_t _KeCPUTable[NCPUS];
error_t KernLog(const char *, ...); error_t KernLog(const char *, ...);
#ifndef _NO_DEBUG #ifndef NDEBUG
void DebugLog(const char *, ...); void DebugLog(const char *, ...);
#else #else
#define DebugLog(fmt, ...) ((void)0) #define DebugLog(fmt, ...) ((void)0)

2
kaleid/kernel/ke/log.c
View File

@ -40,7 +40,7 @@ error_t KernLog(const char *fmt, ...)
return rc; return rc;
} }
#ifndef _NO_DEBUG #ifndef NDEBUG
// //
// Prints formatted string on debug output // Prints formatted string on debug output
// //