From f58afd7e34119f58bc8254c2fd7ea8b118cc227f Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Tue, 28 Feb 2012 12:48:25 +0100 Subject: [PATCH 1/6] Introduce CPP_FOR_TARGET in Makefile --- Makefile.example | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/Makefile.example b/Makefile.example index e5c6d694..365fdb54 100644 --- a/Makefile.example +++ b/Makefile.example @@ -1,45 +1,46 @@ -TOPDIR = $(shell pwd) +TOPDIR := $(shell pwd) ARCH = x86 NAME = metalsvm LWIPDIRS = lwip/src/arch lwip/src/api lwip/src/core lwip/src/core/ipv4 lwip/src/netif DRIVERDIRS = drivers/net drivers/char KERNDIRS = libkern kernel mm fs apps arch/$(ARCH)/kernel arch/$(ARCH)/mm arch/$(ARCH)/scc $(LWIPDIRS) $(DRIVERDIRS) SUBDIRS = $(KERNDIRS) -STACKPROT=-fno-stack-protector +STACKPROT = -fno-stack-protector # Set your own cross compiler tool chain prefix here -CROSSCOMPREFIX= +CROSSCOMPREFIX = # Uncomment both lines if compiling for the SCC! -#CROSSCOMPREFIX=i386-unknown-linux-gnu- -#STACKPROT= +#CROSSCOMPREFIX = i386-unknown-linux-gnu- +#STACKPROT = -CC_FOR_TARGET=$(CROSSCOMPREFIX)gcc -CXX_FOR_TARGET=$(CROSSCOMPREFIX)g++ -GCC_FOR_TARGET=$(CROSSCOMPREFIX)gcc -AR_FOR_TARGET=$(CROSSCOMPREFIX)ar -AS_FOR_TARGET=$(CROSSCOMPREFIX)as -LD_FOR_TARGET=$(CROSSCOMPREFIX)ld -NM_FOR_TARGET=$(CROSSCOMPREFIX)nm -OBJDUMP_FOR_TARGET=$(CROSSCOMPREFIX)objdump -OBJCOPY_FOR_TARGET=$(CROSSCOMPREFIX)objcopy -RANLIB_FOR_TARGET=$(CROSSCOMPREFIX)ranlib -STRIP_FOR_TARGET=$(CROSSCOMPREFIX)strip -READELF_FOR_TARGET=$(CROSSCOMPREFIX)readelf - -NASM = nasm -EMU=qemu -GDB=gdb +CC_FOR_TARGET = $(CROSSCOMPREFIX)gcc +CXX_FOR_TARGET = $(CROSSCOMPREFIX)g++ +GCC_FOR_TARGET = $(CROSSCOMPREFIX)gcc +CPP_FOR_TARGET = $(CROSSCOMPREFIX)cpp +AR_FOR_TARGET = $(CROSSCOMPREFIX)ar +AS_FOR_TARGET = $(CROSSCOMPREFIX)as +LD_FOR_TARGET = $(CROSSCOMPREFIX)ld +NM_FOR_TARGET = $(CROSSCOMPREFIX)nm +OBJDUMP_FOR_TARGET = $(CROSSCOMPREFIX)objdump +OBJCOPY_FOR_TARGET = $(CROSSCOMPREFIX)objcopy +RANLIB_FOR_TARGET = $(CROSSCOMPREFIX)ranlib +STRIP_FOR_TARGET = $(CROSSCOMPREFIX)strip +READELF_FOR_TARGET = $(CROSSCOMPREFIX)readelf MAKE = make +RM = rm -rf +NASM = nasm +EMU = qemu +GDB = gdb + NASMFLAGS = -felf32 -g INCLUDE = -I$(TOPDIR)/include -I$(TOPDIR)/arch/$(ARCH)/include -I$(TOPDIR)/lwip/src/include -I$(TOPDIR)/lwip/src/include/ipv4 -I$(TOPDIR)/drivers # Compiler options for final code CFLAGS = -g -m32 -march=i586 -Wall -O2 -fno-builtin -fstrength-reduce -fomit-frame-pointer -finline-functions -nostdinc $(INCLUDE) $(STACKPROT) -# Compiler options for debuuging +# Compiler options for debugging #CFLAGS = -g -O -m32 -march=i586 -Wall -fno-builtin -DWITH_FRAME_POINTER -nostdinc $(INCLUDE) $(STACKPROT) ARFLAGS = rsv -RM = rm -rf LDFLAGS = -T link.ld -z max-page-size=4096 --defsym __BUILD_DATE=$(shell date +'%Y%m%d') --defsym __BUILD_TIME=$(shell date +'%H%M%S') STRIP_DEBUG = --strip-debug KEEP_DEBUG = --only-keep-debug @@ -104,7 +105,7 @@ veryclean: clean @echo [CC] $@ $Q$(CC_FOR_TARGET) -c -D__KERNEL__ $(CFLAGS) -o $@ $< @echo [DEP] $*.dep - $Q$(CC_FOR_TARGET) -MF $*.dep -MT $*.o -MM $(CFLAGS) $< + $Q$(CPP_FOR_TARGET) -MF $*.dep -MT $*.o -MM $(CFLAGS) $< %.o : %.asm From 4b7cc737f616fc60fdbfb56c4a091bc5924c2ce8 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Tue, 28 Feb 2012 13:16:55 +0100 Subject: [PATCH 2/6] Fix GFX_init() and use it instead of gfx_init() --- apps/gfx_client.c | 2 ++ apps/gfx_generic.c | 15 --------------- apps/gfx_generic.h | 6 +++--- apps/laplace.c | 2 +- 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/apps/gfx_client.c b/apps/gfx_client.c index 5614849d..086d7938 100644 --- a/apps/gfx_client.c +++ b/apps/gfx_client.c @@ -38,7 +38,9 @@ int gfx_init(char* ip_str, char* port_str, int rank) { char* hostname; int port; struct sockaddr_in serveraddr; +#if USE_GETHOSTBYNAME struct hostent *server; +#endif //*pargc -=2; myrank = rank; diff --git a/apps/gfx_generic.c b/apps/gfx_generic.c index 63b6e570..ff1e2a2a 100644 --- a/apps/gfx_generic.c +++ b/apps/gfx_generic.c @@ -22,21 +22,6 @@ #ifdef CONFIG_LWIP -int GFX_init(int* pargc, char*** pargv, int rank) -{ - return gfx_init(pargc, pargv, rank); -} - -int GFX_send(char* buf, int size, int tag) -{ - return gfx_send(buf, size, tag); -} - -int GFX_finalize() -{ - return gfx_finalize(); -} - int GFX_update() { return gfx_send(NULL, 0, GFX_UPDATE); diff --git a/apps/gfx_generic.h b/apps/gfx_generic.h index a2cb57a0..37750f78 100644 --- a/apps/gfx_generic.h +++ b/apps/gfx_generic.h @@ -24,9 +24,9 @@ #ifdef CONFIG_LWIP -int GFX_init(int* pargc, char*** pargv, int rank); -int GFX_send(char* buf, int size, int tag); -int GFX_finalize(); +#define GFX_init(ip_str, port_str, rank) gfx_init(ip_str, port_str, rank) +#define GFX_send(buf, size, tag) gfx_send(buf, size, tag) +#define GFX_finalize() gfx_finalize() int GFX_update(); diff --git a/apps/laplace.c b/apps/laplace.c index 91f9e407..dd8c267d 100644 --- a/apps/laplace.c +++ b/apps/laplace.c @@ -105,7 +105,7 @@ int laplace(void *arg) #ifdef _USE_GFX kprintf("Laplace calls gfx_init\n"); - ret = gfx_init("192.168.4.254" /*&argc */ , "5000" /*&argv */ , my_rank); + ret = GFX_init("192.168.4.254" /*&argc */ , "5000" /*&argv */ , my_rank); kprintf("gfx_init: %d\n", ret); #endif From b64324def1da2f37b7825fd39d9666a7dffb6f33 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Tue, 28 Feb 2012 13:20:46 +0100 Subject: [PATCH 3/6] Fix tautologic compare, harmonize types --- apps/netio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/netio.c b/apps/netio.c index 9a6c374c..8deffcb2 100644 --- a/apps/netio.c +++ b/apps/netio.c @@ -90,7 +90,7 @@ static struct in_addr addr_server; static int send_data(int socket, void *buffer, size_t size, int flags) { - int rc = send(socket, buffer, size, flags); + ssize_t rc = send(socket, buffer, size, flags); if (rc < 0) { @@ -106,7 +106,7 @@ static int send_data(int socket, void *buffer, size_t size, int flags) static int recv_data(int socket, void *buffer, size_t size, int flags) { - size_t rc = recv(socket, buffer, size, flags); + ssize_t rc = recv(socket, buffer, size, flags); if (rc < 0) { kprintf("recv failed: %d\n", errno); From 5e4e0e2159aa4efc5473ad3435cd05a5babc47b9 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Wed, 28 Mar 2012 13:06:25 +0200 Subject: [PATCH 4/6] Edited the Doxyfile Fixed some errors and added a nice iframes treeview. --- Doxyfile | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/Doxyfile b/Doxyfile index fbb573bc..8306ff95 100644 --- a/Doxyfile +++ b/Doxyfile @@ -796,7 +796,7 @@ ALPHABETICAL_INDEX = YES # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) -COLS_IN_ALPHA_INDEX = 5 +COLS_IN_ALPHA_INDEX = 3 # In case all classes in a project start with a common prefix, all # classes will be put under the same header in the alphabetical index. @@ -1063,7 +1063,7 @@ ENUM_VALUES_PER_LINE = 4 # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). # Windows users are probably better off using the HTML help feature. -GENERATE_TREEVIEW = NO +GENERATE_TREEVIEW = YES # By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, # and Class Hierarchy pages using a tree view instead of an ordered list. @@ -1395,7 +1395,7 @@ MACRO_EXPANSION = YES # then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. -EXPAND_ONLY_PREDEF = YES +EXPAND_ONLY_PREDEF = NO # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. @@ -1425,24 +1425,25 @@ INCLUDE_FILE_PATTERNS = # Doxygen messes up the attribute lines as c-structure names PREDEFINED = __attribute__ (x)= \ - __attribute__(x)= \ - __attribute__ ((x))= \ - __attribute__((x))= \ - HAVE_ARCH_STRLEN \ - HAVE_ARCH_STRNCPY \ - HAVE_ARCH_STRCPY \ - HAVE_ARCH_MEMCPY \ - HAVE_ARCH_MEMSET \ - CONFIG_VGA \ - CONFIG_PCI \ - CONFIG_LWIP \ - CONFIG_VGA \ - CONFIG_KEYBOARD \ - CONFIG_MULTIBOOT \ - CONFIG_ROCKCREEK \ - SCC \ - MS_BAREMETAL \ - GORY +__attribute__(x)= \ +__attribute__ ((x))= \ +__attribute__((x))= \ +HAVE_ARCH_STRLEN \ +HAVE_ARCH_STRNCPY \ +HAVE_ARCH_STRCPY \ +HAVE_ARCH_MEMCPY \ +HAVE_ARCH_MEMSET \ +CONFIG_VGA \ +CONFIG_PCI \ +CONFIG_LWIP \ +CONFIG_VGA \ +CONFIG_KEYBOARD \ +CONFIG_MULTIBOOT \ +CONFIG_ROCKCREEK \ +CONFIG_LGUEST \ +SCC \ +MS_BAREMETAL \ +GORY # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. @@ -1535,7 +1536,7 @@ HIDE_UNDOC_RELATIONS = YES # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = YES +HAVE_DOT = NO # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is # allowed to run in parallel. When set to 0 (the default) doxygen will From da1e72f5b311cb5ac10c252f2ea11922b416c4b7 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Wed, 28 Mar 2012 14:01:12 +0200 Subject: [PATCH 5/6] Added the famous Mike Ostrich logo to the documentation! --- documentation/img/mike_ostrich.jpg | Bin 0 -> 5747 bytes documentation/tmpl/header.html | 1 + documentation/tmpl/stylesheet.css | 11 +++++++++++ 3 files changed, 12 insertions(+) create mode 100644 documentation/img/mike_ostrich.jpg diff --git a/documentation/img/mike_ostrich.jpg b/documentation/img/mike_ostrich.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9ab2b54f7c21c0a74ff351e2f5f78e7056525fb9 GIT binary patch literal 5747 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 PAzyL%3|cNwit+Rxvg@|1 literal 0 HcmV?d00001 diff --git a/documentation/tmpl/header.html b/documentation/tmpl/header.html index 7889340f..f0f82961 100644 --- a/documentation/tmpl/header.html +++ b/documentation/tmpl/header.html @@ -20,6 +20,7 @@ $mathjax + diff --git a/documentation/tmpl/stylesheet.css b/documentation/tmpl/stylesheet.css index 016d9d71..b00c22d5 100644 --- a/documentation/tmpl/stylesheet.css +++ b/documentation/tmpl/stylesheet.css @@ -857,9 +857,18 @@ dl.bug top: 5px; right: 5px; } + +#ostrichlogo +{ + position: absolute; + top: 5px; + left: 5px; +} #projectname { + position: relative; + left: 50px; font: 300% Tahoma, Arial,sans-serif; margin: 0px; padding: 2px 0px; @@ -867,6 +876,8 @@ dl.bug #projectbrief { + position: relative; + left: 50px; font: 120% Tahoma, Arial,sans-serif; margin: 0px; padding: 0px; From 72016236f1e4e77b9ee22a6ddfc517f858016069 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Mon, 2 Apr 2012 14:55:29 +0200 Subject: [PATCH 6/6] Fixed two typos. --- arch/x86/kernel/processor.c | 2 +- arch/x86/mm/page.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/processor.c b/arch/x86/kernel/processor.c index f923fabb..d66c1125 100644 --- a/arch/x86/kernel/processor.c +++ b/arch/x86/kernel/processor.c @@ -46,7 +46,7 @@ int cpu_detection(void) kprintf("The CPU owns the Advanced Vector Extensions (AVX). However, MetalSVM doesn't support AVX!\n"); if (has_fpu()) { - kputs("Found and initialize FPU!\n"); + kputs("Found and initialized FPU!\n"); asm volatile ("fninit"); } diff --git a/arch/x86/mm/page.c b/arch/x86/mm/page.c index b721ecf7..86fe358c 100644 --- a/arch/x86/mm/page.c +++ b/arch/x86/mm/page.c @@ -340,7 +340,7 @@ size_t map_region(size_t viraddr, size_t phyaddr, uint32_t npages, uint32_t flag index = (viraddr >> 12) & 0x3FF; if (pgt->entries[index] && !(flags & MAP_REMAP)) { spinlock_unlock(pgd_lock); - kprintf("0x%x is already maped\n", viraddr); + kprintf("0x%x is already mapped\n", viraddr); return 0; }