passing grub modules to kernel

7 files changed, 141 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index adcb776..a96dac3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.swp
 .lastvimsession
+.ycm_extra_conf.pyc
 xxx/
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
new file mode 100644
index 0000000..d4c475d
--- /dev/null
+++ b/.ycm_extra_conf.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python
+
+import os
+import ycm_core
+
+# These are the compilation flags that will be used in case there's no
+# compilation database set (by default, one is not set).
+# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR.
+flags = [
+'-Wall',
+'-Wextra',
+'-Werror',
+'-fexceptions',
+'-DNDEBUG',
+# THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which
+# language to use when compiling headers. So it will guess. Badly. So C++
+# headers will be compiled as C headers. You don't want that so ALWAYS specify
+# a "-std=<something>".
+# For a C project, you would set this to something like 'c99' instead of
+# 'c++11'.
+'-std=c++11',
+# ...and the same thing goes for the magic -x option which specifies the
+# language that the files to be compiled are written in. This is mostly
+# relevant for c++ headers.
+# For a C project, you would set this to 'c' instead of 'c++'.
+'-x',
+'c++',
+'-isystem',
+'/usr/include',
+'-isystem',
+'/usr/local/include',
+'-isystem',
+'/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1',
+'-isystem',
+'/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include',
+]
+
+
+# Set this to the absolute path to the folder (NOT the file!) containing the
+# compile_commands.json file to use that instead of 'flags'. See here for
+# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+#
+# Most projects will NOT need to set this to anything; you can just change the
+# 'flags' list of compilation flags.
+compilation_database_folder = ''
+
+if os.path.exists( compilation_database_folder ):
+  database = ycm_core.CompilationDatabase( compilation_database_folder )
+else:
+  database = None
+
+SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
+
+def DirectoryOfThisScript():
+  return os.path.dirname( os.path.abspath( __file__ ) )
+
+
+def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
+  if not working_directory:
+    return list( flags )
+  new_flags = []
+  make_next_absolute = False
+  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+  for flag in flags:
+    new_flag = flag
+
+    if make_next_absolute:
+      make_next_absolute = False
+      if not flag.startswith( '/' ):
+        new_flag = os.path.join( working_directory, flag )
+
+    for path_flag in path_flags:
+      if flag == path_flag:
+        make_next_absolute = True
+        break
+
+      if flag.startswith( path_flag ):
+        path = flag[ len( path_flag ): ]
+        new_flag = path_flag + os.path.join( working_directory, path )
+        break
+
+    if new_flag:
+      new_flags.append( new_flag )
+  return new_flags
+
+
+def IsHeaderFile( filename ):
+  extension = os.path.splitext( filename )[ 1 ]
+  return extension in [ '.h', '.hxx', '.hpp', '.hh' ]
+
+
+def GetCompilationInfoForFile( filename ):
+  # The compilation_commands.json file generated by CMake does not have entries
+  # for header files. So we do our best by asking the db for flags for a
+  # corresponding source file, if any. If one exists, the flags for that file
+  # should be good enough.
+  if IsHeaderFile( filename ):
+    basename = os.path.splitext( filename )[ 0 ]
+    for extension in SOURCE_EXTENSIONS:
+      replacement_file = basename + extension
+      if os.path.exists( replacement_file ):
+        compilation_info = database.GetCompilationInfoForFile(
+          replacement_file )
+        if compilation_info.compiler_flags_:
+          return compilation_info
+    return None
+  return database.GetCompilationInfoForFile( filename )
+
+
+# This is the entry point; this function is called by ycmd to produce flags for
+# a file.
+def FlagsForFile( filename, **kwargs ):
+  if database:
+    # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+    # python list, but a "list-like" StringVec object
+    compilation_info = GetCompilationInfoForFile( filename )
+    if not compilation_info:
+      return None
+
+    final_flags = MakeRelativePathsInFlagsAbsolute(
+      compilation_info.compiler_flags_,
+      compilation_info.compiler_working_dir_ )
+  else:
+    relative_to = DirectoryOfThisScript()
+    final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
+
+  return {
+    'flags': final_flags,
+    'do_cache': True
+  }
+
diff --git a/Makefile b/Makefile
index 8c50fba..33fa87f 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ ASM_MULTIBOOT_OBJ=$(patsubst %.s, %.o, $(ASM_MULTIBOOT))
 
 ############ Final Targets ############
 
-all: $(FOOLOS) #$(FOOLOS_VDI)
+all: $(FOOLOS) $(FOOLOS_VDI)
 new: clean all
 run: run-qemu-debug
 newrun: clean run
@@ -151,7 +151,8 @@ $(FOOLOS): $(KERNEL_IMG) # $(SUBDIRS)
 # vdi image for VirtualBox
 $(FOOLOS_VDI): $(FOOLOS)
 	-rm FoolOS.vdi
-	VBoxManage convertfromraw $< $@  --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c 
+	#VBoxManage convertfromraw $< $@  --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c 
+	VBoxManage convertfromraw ~/temp/FoolOs/disk.img $@  --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c 
 
 # run in our local bochs (we need cirrus support for our vesa mode)
 run-bochs: all
diff --git a/README.md b/README.md
index a887b66..2bc78a3 100644
--- a/README.md
+++ b/README.md
@@ -151,4 +151,6 @@ in freestanding mode we can just use this c lib headers:
 stdbool,sddef,stdint,
 float,iso646,limits,stdarg
 
+sudo losetup /dev/loop1 disk.img -o 1048576
+
 
diff --git a/kernel/kernel.c b/kernel/kernel.c
index d0f1bce..91e1c45 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -69,8 +69,9 @@ void kernel_main(uint32_t eax,uint32_t ebx)
 
 	for(int i=0;i<info->mods_count;i++)
 	{
-	    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mod at 0x08%X-0x08%X : %s", 
+	    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mod at 0x%08X-0x%08X : %s", 
 		    mod->mod_start,mod->mod_end, mod->string);
+		    
 	    mod++;
 	}
     }
diff --git a/kernel/kernel.h b/kernel/kernel.h
index 364375b..d5b5a0f 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -1,7 +1,7 @@
 #ifndef FOOLOS_KERNEL_H
 #define FOOLOS_KERNEL_H
 
-#define KERNEL_VERSION "FoolOs 0.1"
+#define KERNEL_VERSION "FoolOs 0.1.1"
 
 
 #endif
diff --git a/linker.ld b/linker.ld
index 92ca00f..f823710 100644
--- a/linker.ld
+++ b/linker.ld
@@ -2,7 +2,7 @@ ENTRY(_start)
 
 SECTIONS
 {
-    . = 2M;
+    . = 1M;
 
     .text BLOCK(4K) : ALIGN(4K)
     {