[Ya-mos-submit] SF.net SVN: ya-mos:[161] borium
Status: Alpha
Brought to you by:
mizztajonny
Menu
▾
▴
[Ya-mos-submit] SF.net SVN: ya-mos:[161] borium
|
From: <miz...@us...> - 2010-06-12 23:23:14
|
Revision: 161
http://ya-mos.svn.sourceforge.net/ya-mos/?rev=161&view=rev
Author: mizztajonny
Date: 2010-06-12 23:23:05 +0000 (Sat, 12 Jun 2010)
Log Message:
-----------
...
Modified Paths:
--------------
borium/configure.ac
borium/nbproject/Makefile-Default.mk
borium/nbproject/Makefile-variables.mk
borium/nbproject/Package-Default.bash
borium/nbproject/configurations.xml
borium/nbproject/private/configurations.xml
borium/src/Kernel/Kernel.cpp
borium/src/Kernel/Kernel.h
borium/src/Makefile.am
borium/src/Managers/Makefile.am
borium/src/Managers/Memory/Bitmap.cpp
borium/src/Managers/Memory/Bitmap.h
borium/src/Managers/Memory/Makefile.am
borium/src/Managers/Memory/PhysicalMemoryManager.cpp
borium/src/Managers/Memory/PhysicalMemoryManager.h
borium/src/Managers/Memory/VirtualMemoryManager.cpp
borium/src/Managers/Memory/VirtualMemoryMap.cpp
borium/src/Managers/Memory/VirtualMemoryRegion.cpp
borium/src/Managers/Platform/BootInformation.cpp
borium/src/Managers/Platform/Cpu.cpp
borium/src/Managers/Platform/CpuManager.cpp
borium/src/Managers/Platform/CpuManager.h
borium/src/Managers/Platform/Makefile.am
borium/src/Stage1/Stage1.cpp
borium/testing/bootdisk.img
borium/testing/grub.img
borium/testing/grub_overlay/kernel
Property Changed:
----------------
borium/src/
borium/src/Managers/
borium/src/Managers/Memory/
borium/src/Managers/Platform/
Modified: borium/configure.ac
===================================================================
--- borium/configure.ac 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/configure.ac 2010-06-12 23:23:05 UTC (rev 161)
@@ -9,7 +9,10 @@
src/Stage0/Makefile
src/Stage1/Makefile
src/Kernel/Makefile
- src/LibCpp/Makefile])
+ src/LibCpp/Makefile
+ src/Managers/Makefile
+ src/Managers/Platform/Makefile
+ src/Managers/Memory/Makefile])
# Checks for programs.
AC_PROG_CXX
Modified: borium/nbproject/Makefile-Default.mk
===================================================================
--- borium/nbproject/Makefile-Default.mk 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/nbproject/Makefile-Default.mk 2010-06-12 23:23:05 UTC (rev 161)
@@ -19,7 +19,7 @@
AS=as
# Macros
-CND_PLATFORM=Own_GNU-Linux-x86
+CND_PLATFORM=GNU-Linux-x86
CND_CONF=Default
CND_DISTDIR=dist
Modified: borium/nbproject/Makefile-variables.mk
===================================================================
--- borium/nbproject/Makefile-variables.mk 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/nbproject/Makefile-variables.mk 2010-06-12 23:23:05 UTC (rev 161)
@@ -7,10 +7,10 @@
CND_BUILDDIR=build
CND_DISTDIR=dist
# Default configuration
-CND_PLATFORM_Default=Own_GNU-Linux-x86
+CND_PLATFORM_Default=GNU-Linux-x86
CND_ARTIFACT_DIR_Default=
CND_ARTIFACT_NAME_Default=
CND_ARTIFACT_PATH_Default=
-CND_PACKAGE_DIR_Default=dist/Default/Own_GNU-Linux-x86/package
+CND_PACKAGE_DIR_Default=dist/Default/GNU-Linux-x86/package
CND_PACKAGE_NAME_Default=borium.tar
-CND_PACKAGE_PATH_Default=dist/Default/Own_GNU-Linux-x86/package/borium.tar
+CND_PACKAGE_PATH_Default=dist/Default/GNU-Linux-x86/package/borium.tar
Modified: borium/nbproject/Package-Default.bash
===================================================================
--- borium/nbproject/Package-Default.bash 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/nbproject/Package-Default.bash 2010-06-12 23:23:05 UTC (rev 161)
@@ -6,7 +6,7 @@
# Macros
TOP=`pwd`
-CND_PLATFORM=Own_GNU-Linux-x86
+CND_PLATFORM=GNU-Linux-x86
CND_CONF=Default
CND_DISTDIR=dist
TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
Modified: borium/nbproject/configurations.xml
===================================================================
--- borium/nbproject/configurations.xml 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/nbproject/configurations.xml 2010-06-12 23:23:05 UTC (rev 161)
@@ -8,14 +8,12 @@
<df name="deprecated">
</df>
</df>
+ <df name="nbproject-2">
+ <df name="private">
+ </df>
+ </df>
<df name="src">
- <df name=".deps">
- </df>
- <df name=".libs">
- </df>
<df name="Kernel">
- <df name=".deps">
- </df>
<in>Kernel.cpp</in>
<in>Kernel.h</in>
<in>Types.h</in>
@@ -70,6 +68,8 @@
<in>Thread.h</in>
</df>
<df name="Platform">
+ <df name=".deps">
+ </df>
<in>BootInformation.cpp</in>
<in>BootInformation.h</in>
<in>Cpu.cpp</in>
@@ -83,12 +83,8 @@
</df>
</df>
<df name="Stage0">
- <df name=".deps">
- </df>
</df>
<df name="Stage1">
- <df name=".deps">
- </df>
<in>Stage1.cpp</in>
</df>
</df>
@@ -166,7 +162,7 @@
<conf name="Default" type="0">
<toolsSet>
<developmentServer>localhost</developmentServer>
- <compilerSet>Own_GNU|Unknown</compilerSet>
+ <compilerSet>GNU|GNU</compilerSet>
<assemblerRequired>true</assemblerRequired>
<platform>2</platform>
</toolsSet>
@@ -189,6 +185,160 @@
</ccTool>
</makeTool>
</makefileType>
+ <item path="config.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/kernel/CKernel.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/kernel/CKernel.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/kernel/Kernel.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/kernel/Kernel.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/kernel/Multiboot.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/kernel/Multiboot.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/kernel/SystemObject.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/kernel/SystemObject.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/kernel/main.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/libCpp/ctype.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libCpp/cxa_ctors.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/libCpp/cxa_ctors.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libCpp/cxa_dtors.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/libCpp/cxa_dtors.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libCpp/cxa_virtual.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/libCpp/cxa_virtual.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libCpp/limits.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libCpp/operators.cc" ex="true" tool="1">
+ </item>
+ <item path="src-deprecated/libCpp/operators.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libCpp/stdargs.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libCpp/stdlib.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libCpp/types.h" ex="true" tool="3">
+ </item>
+ <item path="src-deprecated/libHal/arch/arch.h" ex="true" tool="3">
+ </item>
+ <item path="src/Kernel/Kernel.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Kernel/Kernel.h" ex="true" tool="3">
+ </item>
+ <item path="src/Kernel/Types.h" ex="true" tool="3">
+ </item>
+ <item path="src/Kernel/Version.h" ex="true" tool="3">
+ </item>
+ <item path="src/LibCpp/CString.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/LibCpp/CString.h" ex="true" tool="3">
+ </item>
+ <item path="src/LibCpp/CType.h" ex="true" tool="3">
+ </item>
+ <item path="src/LibCpp/CxaVirtual.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/LibCpp/CxaVirtual.h" ex="true" tool="3">
+ </item>
+ <item path="src/LibCpp/Limits.h" ex="true" tool="3">
+ </item>
+ <item path="src/LibCpp/Operators.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/LibCpp/Operators.h" ex="true" tool="3">
+ </item>
+ <item path="src/LibCpp/StdArgs.h" ex="true" tool="3">
+ </item>
+ <item path="src/LibCpp/StdLib.h" ex="true" tool="3">
+ </item>
+ <item path="src/LibCpp/Types.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Communication/ExceptionManager.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Communication/ExceptionManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Communication/ExceptionRoutine.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Communication/ExceptionRoutine.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Communication/HardwareIoManager.cpp"
+ ex="true"
+ tool="1">
+ </item>
+ <item path="src/Managers/Communication/HardwareIoManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Communication/InterruptManager.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Communication/InterruptManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Communication/InterruptRoutine.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Communication/InterruptRoutine.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Communication/SyscallManager.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Communication/SyscallManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Memory/Bitmap.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Memory/Bitmap.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Memory/PhysicalMemoryManager.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Memory/PhysicalMemoryManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Memory/VirtualMemoryManager.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Memory/VirtualMemoryManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Memory/VirtualMemoryMap.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Memory/VirtualMemoryMap.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Memory/VirtualMemoryRegion.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Memory/VirtualMemoryRegion.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Multitasking/Task.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Multitasking/Task.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Multitasking/TaskManager.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Multitasking/TaskManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Multitasking/Thread.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Multitasking/Thread.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Platform/BootInformation.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Platform/BootInformation.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Platform/Cpu.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Platform/Cpu.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Platform/CpuManager.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Platform/CpuManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Managers/Resources/ResourcesManager.cpp" ex="true" tool="1">
+ </item>
+ <item path="src/Managers/Resources/ResourcesManager.h" ex="true" tool="3">
+ </item>
+ <item path="src/Stage1/Stage1.cpp" ex="true" tool="1">
+ </item>
</conf>
</confs>
</configurationDescriptor>
Modified: borium/nbproject/private/configurations.xml
===================================================================
--- borium/nbproject/private/configurations.xml 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/nbproject/private/configurations.xml 2010-06-12 23:23:05 UTC (rev 161)
@@ -9,7 +9,6 @@
<array_repeat_threshold>10</array_repeat_threshold>
</gdbdebugger>
<gizmo_options version="3">
- <configurationname>GizmoSimple</configurationname>
</gizmo_options>
<runprofile version="6">
<args></args>
Property changes on: borium/src
___________________________________________________________________
Modified: svn:ignore
- .deps
borium
Makefile.in
Makefile
Doxyfile
+ .deps
borium
Makefile.in
Makefile
Doxyfile
.libs
Modified: borium/src/Kernel/Kernel.cpp
===================================================================
--- borium/src/Kernel/Kernel.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Kernel/Kernel.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -23,11 +23,14 @@
// section 127-0-0-1--112e3091:128e3c69e1d:-8000:00000000000011EC begin
{
// Initialize the CPU Manager
+ TheCpuManager.Init();
+ // Initialize physical memory
+ ThePhysicalMemoryManager.Init();
+
// Copy all needed data (e.g. from bootloader) to a safe place
+
- // Initialize physical memory
-
// Initialize exception manager
// Initialize virtual memory
Modified: borium/src/Kernel/Kernel.h
===================================================================
--- borium/src/Kernel/Kernel.h 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Kernel/Kernel.h 2010-06-12 23:23:05 UTC (rev 161)
@@ -3,6 +3,8 @@
#include "Version.h"
#include "../LibCpp/StdLib.h"
+#include "../Managers/Platform/CpuManager.h"
+#include "../Managers/Memory/PhysicalMemoryManager.h"
/** @author Harry Hornbacher
*/
@@ -30,6 +32,9 @@
char CodeName[ 25];
Version KernelVersion;
+ // The Managers
+ Managers::Platform::CpuManager TheCpuManager;
+ Managers::Memory::PhysicalMemoryManager ThePhysicalMemoryManager;
};
}
Modified: borium/src/Makefile.am
===================================================================
--- borium/src/Makefile.am 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Makefile.am 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,4 +1,4 @@
-SUBDIRS = Stage0 Stage1 LibCpp Kernel
+SUBDIRS = Stage0 Stage1 LibCpp Kernel Managers
CFLAGS=-m32 -nostdinc -nostartfiles -nostdlib -ffreestanding -fno-builtin -fno-rtti -fno-exceptions -nostartfiles -nodefaultlibs -fno-stack-protector
CCASFLAGS=-m32
@@ -6,5 +6,5 @@
boriumdir = ../
borium_PROGRAMS = borium
borium_SOURCES =
-borium_LDADD = Stage0/libStage0.a Stage1/libStage1.a Kernel/libKernel.a LibCpp/libCpp.a
+borium_LDADD = Stage0/libStage0.a Stage1/libStage1.a Kernel/libKernel.a LibCpp/libCpp.a Managers/Platform/libPlatform.a Managers/Memory/libMemory.a
borium_LDFLAGS = -Tkernel.ld
Property changes on: borium/src/Managers
___________________________________________________________________
Modified: svn:ignore
- Makefile.in
Makefile
+ Makefile.in
Makefile
libManagers.a
.deps
Modified: borium/src/Managers/Makefile.am
===================================================================
--- borium/src/Managers/Makefile.am 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Makefile.am 2010-06-12 23:23:05 UTC (rev 161)
@@ -0,0 +1,2 @@
+SUBDIRS = Platform Memory
+
Property changes on: borium/src/Managers/Memory
___________________________________________________________________
Modified: svn:ignore
- Makefile.in
Makefile
+ Makefile.in
Makefile
.deps
libMemory.a
Modified: borium/src/Managers/Memory/Bitmap.cpp
===================================================================
--- borium/src/Managers/Memory/Bitmap.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Memory/Bitmap.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -13,7 +13,7 @@
}
void Bitmap::ClearAll() {
- for(size_t i = 0; i < Size; i++)
+ for(size_t i = 0; i < BitmapSize; i++)
BitmapPointer[i] = 0;
}
@@ -30,13 +30,13 @@
}
- size_t Bitmap::GetFirstSet(size_t Length = 1) {
+ size_t Bitmap::GetFirstSet(size_t Length) {
if(Length == 0)
return (size_t)-1;
Dword free = 0;
- for(size_t i = 0; i < Size; i++)
+ for(size_t i = 0; i < BitmapSize; i++)
{
if(BitmapPointer[i] != 0xFFFFFFFF)
{
Modified: borium/src/Managers/Memory/Bitmap.h
===================================================================
--- borium/src/Managers/Memory/Bitmap.h 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Memory/Bitmap.h 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,7 +1,8 @@
#ifndef Managers_Memory_Bitmap_h
#define Managers_Memory_Bitmap_h
-#include "../../Version.h"
+#include "../../Kernel/Version.h"
+#include "../../LibCpp/StdLib.h"
/** @author Harry Hornbacher
@@ -20,9 +21,9 @@
Bitmap();
void ClearAll();
- void Set();
- bool Get();
- void Clear();
+ void Set(size_t Index);
+ bool Get(size_t Index);
+ void Clear(size_t Index);
size_t GetFirstSet(size_t Length = 1);
};
Modified: borium/src/Managers/Memory/Makefile.am
===================================================================
--- borium/src/Managers/Memory/Makefile.am 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Memory/Makefile.am 2010-06-12 23:23:05 UTC (rev 161)
@@ -0,0 +1,6 @@
+CXXFLAGS=-m32 -nostdinc -nostartfiles -nostdlib -ffreestanding -fno-builtin -fno-rtti -fno-exceptions -nostartfiles -nodefaultlibs -fno-stack-protector
+
+noinst_LIBRARIES = libMemory.a
+libMemory_a_SOURCES = Bitmap.cpp PhysicalMemoryManager.cpp VirtualMemoryManager.cpp VirtualMemoryMap.cpp VirtualMemoryRegion.cpp
+
+
Modified: borium/src/Managers/Memory/PhysicalMemoryManager.cpp
===================================================================
--- borium/src/Managers/Memory/PhysicalMemoryManager.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Memory/PhysicalMemoryManager.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -7,10 +7,13 @@
*/
namespace Memory {
- /* {src_lang=cpp}*/
+ /* {src_lang=cpp}*/
+ void PhysicalMemoryManager::Init() {
+ }
+
PhysicalAddress *PhysicalMemoryManager::AllocBlock()
// don't delete the following line as it's needed to preserve source code of this autogenerated element
// section 127-0-0-1-16a504c9:128bd419af3:-8000:0000000000001196 begin
@@ -48,7 +51,7 @@
// don't delete the following line as it's needed to preserve source code of this autogenerated element
// section 127-0-0-1-16a504c9:128bd419af3:-8000:00000000000011A4 begin
{
- return (AvailibleBlocks-FreeBlocks)*BLOCK_SIZE;
+ return (AvailibleBlocks - FreeBlocks)*BLOCK_SIZE;
}
// section 127-0-0-1-16a504c9:128bd419af3:-8000:00000000000011A4 end
// don't delete the previous line as it's needed to preserve source code of this autogenerated element
Modified: borium/src/Managers/Memory/PhysicalMemoryManager.h
===================================================================
--- borium/src/Managers/Memory/PhysicalMemoryManager.h 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Memory/PhysicalMemoryManager.h 2010-06-12 23:23:05 UTC (rev 161)
@@ -2,7 +2,8 @@
#define Managers_Memory_PhysicalMemoryManager_h
#include "Bitmap.h"
-#include "../../Version.h"
+#include "../../Kernel/Version.h"
+#include "../../LibCpp/StdLib.h"
@@ -31,6 +32,8 @@
public:
+ void Init();
+
PhysicalAddress *AllocBlock();
void FreeBlock(PhysicalAddress Pointer, size_t Length = 0);
Modified: borium/src/Managers/Memory/VirtualMemoryManager.cpp
===================================================================
--- borium/src/Managers/Memory/VirtualMemoryManager.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Memory/VirtualMemoryManager.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,84 +1,74 @@
#include "VirtualMemoryManager.h"
/** @author Harry Hornbacher
- */
+ */
namespace Managers {
-/** @author Harry Hornbacher
+ /** @author Harry Hornbacher
*/
-namespace Memory {
+ namespace Memory {
+ /* {src_lang=cpp}*/
+ /**
+ * Allocate a/some free Page/-s
+ */
+ void VirtualMemoryManager::AllocPage()
+ // don't delete the following line as it's needed to preserve source code of this autogenerated element
+ // section 127-0-0-1--7594528:1287e7358a9:-8000:00000000000024A0 begin
+ {
+ }
+ // section 127-0-0-1--7594528:1287e7358a9:-8000:00000000000024A0 end
+ // don't delete the previous line as it's needed to preserve source code of this autogenerated element
-{
- /* {src_lang=cpp}*/
+ /**
+ * Free an/some allocated Page/-s
+ */
+ void VirtualMemoryManager::FreePage()
+ // don't delete the following line as it's needed to preserve source code of this autogenerated element
+ // section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011A6 begin
+ {
+ }
+ // section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011A6 end
+ // don't delete the previous line as it's needed to preserve source code of this autogenerated element
+ /**
+ * Identity map some memory
+ */
+ void VirtualMemoryManager::IdentityMap()
+ // don't delete the following line as it's needed to preserve source code of this autogenerated element
+ // section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011A8 begin
+ {
+ }
+ // section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011A8 end
+ // don't delete the previous line as it's needed to preserve source code of this autogenerated element
+ /**
+ * Translate the VirtualAddress to the corresponding PhysicalAddress
+ */
+ void VirtualMemoryManager::TranslateAddress()
+ // don't delete the following line as it's needed to preserve source code of this autogenerated element
+ // section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011AA begin
+ {
+ }
+ // section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011AA end
+ // don't delete the previous line as it's needed to preserve source code of this autogenerated element
+ /**
+ * Flush the Translation Lookaside Buffer
+ */
+ void VirtualMemoryManager::FlushTlb()
+ // don't delete the following line as it's needed to preserve source code of this autogenerated element
+ // section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011EB begin
+ {
+ }
+ // section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011EB end
+ // don't delete the previous line as it's needed to preserve source code of this autogenerated element
-/**
- * Allocate a/some free Page/-s
- */
-void VirtualMemoryManager::AllocPage()
-// don't delete the following line as it's needed to preserve source code of this autogenerated element
-// section 127-0-0-1--7594528:1287e7358a9:-8000:00000000000024A0 begin
-{
-}
-// section 127-0-0-1--7594528:1287e7358a9:-8000:00000000000024A0 end
-// don't delete the previous line as it's needed to preserve source code of this autogenerated element
-
-/**
- * Free an/some allocated Page/-s
- */
-void VirtualMemoryManager::FreePage()
-// don't delete the following line as it's needed to preserve source code of this autogenerated element
-// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011A6 begin
-{
-}
-// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011A6 end
-// don't delete the previous line as it's needed to preserve source code of this autogenerated element
-
-
-/**
- * Identity map some memory
- */
-void VirtualMemoryManager::IdentityMap()
-// don't delete the following line as it's needed to preserve source code of this autogenerated element
-// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011A8 begin
-{
-}
-// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011A8 end
-// don't delete the previous line as it's needed to preserve source code of this autogenerated element
-
-
-/**
- * Translate the VirtualAddress to the corresponding PhysicalAddress
- */
-void VirtualMemoryManager::TranslateAddress()
-// don't delete the following line as it's needed to preserve source code of this autogenerated element
-// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011AA begin
-{
-}
-// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011AA end
-// don't delete the previous line as it's needed to preserve source code of this autogenerated element
-
-
-/**
- * Flush the Translation Lookaside Buffer
- */
-void VirtualMemoryManager::FlushTlb()
-// don't delete the following line as it's needed to preserve source code of this autogenerated element
-// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011EB begin
-{
-}
-// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011EB end
-// don't delete the previous line as it's needed to preserve source code of this autogenerated element
-
-
-} /* End of namespace Managers::Memory */
+ } /* End of namespace Managers::Memory */
} /* End of namespace Managers */
/* lost code following:
// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011AC begin
{
}
// section 127-0-0-1--5acc753c:128d6ae1493:-8000:00000000000011AC end
-*/
\ No newline at end of file
+ */
\ No newline at end of file
Modified: borium/src/Managers/Memory/VirtualMemoryMap.cpp
===================================================================
--- borium/src/Managers/Memory/VirtualMemoryMap.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Memory/VirtualMemoryMap.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,15 +1,15 @@
#include "VirtualMemoryMap.h"
/** @author Harry Hornbacher
- */
+ */
namespace Managers {
-/** @author Harry Hornbacher
+ /** @author Harry Hornbacher
*/
-namespace Memory {
+ namespace Memory {
-{
- /* {src_lang=cpp}*/
-} /* End of namespace Managers::Memory */
+ /* {src_lang=cpp}*/
+
+ } /* End of namespace Managers::Memory */
} /* End of namespace Managers */
Modified: borium/src/Managers/Memory/VirtualMemoryRegion.cpp
===================================================================
--- borium/src/Managers/Memory/VirtualMemoryRegion.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Memory/VirtualMemoryRegion.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,15 +1,13 @@
#include "VirtualMemoryRegion.h"
/** @author Harry Hornbacher
- */
+ */
namespace Managers {
-/** @author Harry Hornbacher
+ /** @author Harry Hornbacher
*/
-namespace Memory {
+ namespace Memory {
+ /* {src_lang=cpp}*/
-{
- /* {src_lang=cpp}*/
-
-} /* End of namespace Managers::Memory */
+ } /* End of namespace Managers::Memory */
} /* End of namespace Managers */
Property changes on: borium/src/Managers/Platform
___________________________________________________________________
Modified: svn:ignore
- Makefile.in
Makefile
+ Makefile.in
Makefile
.deps
libPlatform.a
Modified: borium/src/Managers/Platform/BootInformation.cpp
===================================================================
--- borium/src/Managers/Platform/BootInformation.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Platform/BootInformation.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,15 +1,14 @@
#include "BootInformation.h"
/** @author Harry Hornbacher
- */
+ */
namespace Managers {
-/** @author Harry Hornbacher
+ /** @author Harry Hornbacher
*/
-namespace Platform {
+ namespace Platform {
-{
- /* {src_lang=cpp}*/
+ /* {src_lang=cpp}*/
-} /* End of namespace Managers::Platform */
+ } /* End of namespace Managers::Platform */
} /* End of namespace Managers */
Modified: borium/src/Managers/Platform/Cpu.cpp
===================================================================
--- borium/src/Managers/Platform/Cpu.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Platform/Cpu.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,20 +1,19 @@
#include "Cpu.h"
/** @author Harry Hornbacher
- */
+ */
namespace Managers {
-/** @author Harry Hornbacher
+ /** @author Harry Hornbacher
*/
-namespace Platform {
+ namespace Platform {
- /**
- * This STRUCT bundles all important CPU information
- * @author Harry Hornbacher
- */
+ /**
+ * This STRUCT bundles all important CPU information
+ * @author Harry Hornbacher
+ */
+
+ /* {src_lang=cpp}*/
-{
- /* {src_lang=cpp}*/
-
-} /* End of namespace Managers::Platform */
+ } /* End of namespace Managers::Platform */
} /* End of namespace Managers */
Modified: borium/src/Managers/Platform/CpuManager.cpp
===================================================================
--- borium/src/Managers/Platform/CpuManager.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Platform/CpuManager.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,15 +1,19 @@
#include "CpuManager.h"
/** @author Harry Hornbacher
- */
+ */
namespace Managers {
-/** @author Harry Hornbacher
+ /** @author Harry Hornbacher
*/
-namespace Platform {
+ namespace Platform {
+ /* {src_lang=cpp}*/
-{
- /* {src_lang=cpp}*/
+ void CpuManager::Init() {
+ // Initialize GDT
+ // Initialize IDT
+ }
-} /* End of namespace Managers::Platform */
-} /* End of namespace Managers */
+ /* End of namespace Managers::Platform */
+ } /* End of namespace Managers */
+}
\ No newline at end of file
Modified: borium/src/Managers/Platform/CpuManager.h
===================================================================
--- borium/src/Managers/Platform/CpuManager.h 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Platform/CpuManager.h 2010-06-12 23:23:05 UTC (rev 161)
@@ -1,30 +1,34 @@
#ifndef Managers_Platform_CpuManager_h
#define Managers_Platform_CpuManager_h
-#include <vector>
-
#include "Cpu.h"
/** @author Harry Hornbacher
- */
+ */
namespace Managers {
-/** @author Harry Hornbacher
+ /** @author Harry Hornbacher
*/
-namespace Platform {
+ namespace Platform {
-class CpuManager
-{
- /* {src_lang=cpp}*/
+ class CpuManager {
+ /* {src_lang=cpp}*/
+ public:
+ void Init();
- private:
- std::vector< Cpu > mCpus;
+ private:
+ Cpu BootstrapProcessor;
-};
+ /**
+ * FIXME: Change type to own template class
+ */
+ //std::vector< Cpu > ApplicationProcessors;
-} /* End of namespace Managers::Platform */
+ };
+
+ } /* End of namespace Managers::Platform */
} /* End of namespace Managers */
#endif // Managers_Platform_CpuManager_h
Modified: borium/src/Managers/Platform/Makefile.am
===================================================================
--- borium/src/Managers/Platform/Makefile.am 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Managers/Platform/Makefile.am 2010-06-12 23:23:05 UTC (rev 161)
@@ -0,0 +1,5 @@
+CXXFLAGS=-m32 -nostdinc -nostartfiles -nostdlib -ffreestanding -fno-builtin -fno-rtti -fno-exceptions -nostartfiles -nodefaultlibs -fno-stack-protector
+
+noinst_LIBRARIES = libPlatform.a
+libPlatform_a_SOURCES = BootInformation.cpp Cpu.cpp CpuManager.cpp
+
Modified: borium/src/Stage1/Stage1.cpp
===================================================================
--- borium/src/Stage1/Stage1.cpp 2010-06-12 22:22:58 UTC (rev 160)
+++ borium/src/Stage1/Stage1.cpp 2010-06-12 23:23:05 UTC (rev 161)
@@ -60,14 +60,14 @@
/**
* Global Kernel Class
*/
-Kernel::Kernel theKernel;
+Kernel::Kernel TheKernel;
void InitStage1(void *MultibootHeader) {
CallConstructors();
- theKernel.Init();
+ TheKernel.Init();
- theKernel.Run();
+ TheKernel.Run();
CallDestructors();
}
Modified: borium/testing/bootdisk.img
===================================================================
(Binary files differ)
Modified: borium/testing/grub.img
===================================================================
(Binary files differ)
Modified: borium/testing/grub_overlay/kernel
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|