Refactor to the new OmniaFramework structure

extra/config/testMachine.dvm

@@ -3,7 +3,7 @@ Bios = dragon/bios.bin
 CMOS = dragon/cmos.dr
 
 cpuext = extmov, extalu
-fixed_clock = false
+fixed_clock = true
 clock_rate_sec = 5000
 memory_extension_pages = 16
 

extra/dss/DragonOS/kernel0/kernel0.dss

@@ -4,8 +4,8 @@
 .header KERNEL0_BOOT
 
 @include <../../sdk/bios_api.dss>
-@include <../drivers/keyboard_driver.dss>
 @include <../drivers/display_driver.dss>
+@include <../drivers/keyboard_driver.dss>
 @include <memory.dss>
 
 
@@ -30,7 +30,7 @@ _kernel0_main:
 	call $_print_string
 	## debug_break
 _infinite_loop_0:
-	jmp $_infinite_loop_0
+	## jmp $_infinite_loop_0
 
 	mov [$cursor_x], 0
 
@@ -58,16 +58,18 @@ _infinite_loop:
 
 ## =========================================================================================================================
 _key_pressed:
-	## debug_break
+	debug_break
 	mov R1, [Keyboard_Registers.KEYCODE]
 
 	mov ACC, KeyCodes.Return
 	jeq $_key_pressed_enter, R1
 
-	mov ACC, KeyCodes.LowerCase_a
+	push R1
-	jls $_key_pressed_end, R1
+	push 1
-	mov ACC,  KeyCodes.LowerCase_z
+	call $_is_char_printable
-	jgr $_key_pressed_end, R1
+
+	mov ACC, RV
+	jne $_key_pressed_end, 1
 	push R1
 	mov R2, [$cursor_x]
 	push R2
@@ -87,4 +89,17 @@ _key_pressed_enter:
 
 _key_pressed_end:
 	ret
+
+
+_is_char_printable:
+	arg R9
+	mov ACC, KeyCodes.Spacebar
+	jls $_is_char_printable_false, R9
+	mov ACC, KeyCodes.LowerCase_z
+	jgr $_is_char_printable_false, R9
+	mov RV, 1
+	ret
+_is_char_printable_false:
+	mov RV, 0
+	ret
 ## =========================================================================================================================

extra/dss/sdk/bios_api.dss

@@ -1,5 +1,5 @@
 ## --
-## -- This file is automatically generated by the DragonAssembler (version 0.4.1641) 
+## -- This file is automatically generated by the DragonAssembler (version 0.4.1642) 
 ## -- Please do not modify this file in any way. 
 ## --
 

other/build.nr

@@ -1 +1 @@
-1642
+1643

src/assembler/Assembler.cpp

@@ -1,10 +1,10 @@
 #include "Assembler.hpp"
-#include <ostd/File.hpp>
+#include <ostd/io/File.hpp>
 #include <iostream>
 #include <fstream>
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
-#include <ostd/Serial.hpp>
+#include <ostd/io/Serial.hpp>
-#include <ostd/IOHandlers.hpp>
+#include <ostd/io/IOHandlers.hpp>
 
 #include "../tools/GlobalData.hpp"
 #include "../hardware/VirtualHardDrive.hpp"
@@ -1143,6 +1143,11 @@ namespace dragon
 				m_code.push_back(data::OpCodes::DEBUG_Break);
 				return;
 			}
+			else if (ostd::String(line).toLower().startsWith("debug_ram_dump"))
+			{
+				m_code.push_back(data::OpCodes::DEBUG_DumpRAM);
+				return;
+			}
 			else if (ostd::String(line).toLower().startsWith("debug_profile_stop"))
 			{
 				m_code.push_back(data::OpCodes::DEBUG_StopProfile);

src/assembler/Assembler.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
-#include <ostd/IOHandlers.hpp>
+#include <ostd/io/IOHandlers.hpp>
 #include <unordered_map>
 
 namespace dragon

src/assembler/DASMApp.cpp

@@ -1,5 +1,5 @@
 #include "Assembler.hpp"
-#include <ostd/Random.hpp>
+#include <ostd/math/Random.hpp>
 
 namespace dragon
 {

src/assembler/IncludePreprocessor.cpp

@@ -1,6 +1,6 @@
 #include "Assembler.hpp"
 
-#include <ostd/File.hpp>
+#include <ostd/io/File.hpp>
 
 namespace dragon
 {

src/assembler/assembler_main.cpp

@@ -1,3 +1,4 @@
+#include <ostd/utils/Defines.hpp>
 #include "Assembler.hpp"
 
 int main(int argc, char** argv)

src/debugger/Debugger.cpp

@@ -1,8 +1,7 @@
 #include "Debugger.hpp"
 #include "../runtime/DragonRuntime.hpp"
 #include "DisassemblyLoader.hpp"
-#include <ostd/Defines.hpp>
+#include <ostd/io/Console.hpp>
-#include <ostd/Console.hpp>
 
 namespace dragon
 {
@@ -1438,6 +1437,8 @@ namespace dragon
 		processErrors();
 		if (DragonRuntime::cpu.isInDebugBreakPoint())
 			output().fg(ostd::ConsoleColors::Red).p("Reached Debug Break Point.").reset().nl();
+		if (DragonRuntime::cpu.isRamDumped())
+			output().fg(ostd::ConsoleColors::Red).p("RAM Dumped to <ram_dump.bin>.").reset().nl();
 		Display::printPrompt();
 		data().command = getCommandInput();
 		data().command.trim().toLower();

src/debugger/Debugger.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
-#include <ostd/IOHandlers.hpp>
+#include <ostd/io/IOHandlers.hpp>
 #include "../assembler/Assembler.hpp"
 
 namespace dragon

src/debugger/DebuggerNew.cpp

@@ -3,12 +3,11 @@
 #include <cstdint>
 #include <ogfx/BasicRenderer.hpp>
 #include <ogfx/WindowBase.hpp>
-#include <ostd/Defines.hpp>
+#include <ostd/math/Geometry.hpp>
-#include <ostd/Geometry.hpp>
+#include <ostd/io/IOHandlers.hpp>
-#include <ostd/IOHandlers.hpp>
+#include <ostd/math/Random.hpp>
-#include <ostd/Random.hpp>
+#include <ostd/string/String.hpp>
-#include <ostd/String.hpp>
+#include <ostd/utils/Utils.hpp>
-#include <ostd/Utils.hpp>
 #include "DisassemblyLoader.hpp"
 #include "../runtime/DragonRuntime.hpp"
 
@@ -701,7 +700,7 @@ namespace dragon
 		m_wout.setWrapMode(ogfx::WindowBaseOutputHandler::eWrapMode::TripleDots);
 		m_wout.setDefaultForegroundColor({ 180, 180, 180, 255 });
 
-		std::cout << STR_BOOL(ostd::Utils::loadByteStreamFromFile("./test.dds", m_test)) << "\n";
+		std::cout << STR_BOOL(ostd::Utils::loadByteStreamFromFile("./bios.bin", m_test)) << "\n";
  	}
 
 	void DebuggerNew::handleSignal(ostd::tSignal& signal)

src/debugger/DebuggerNew.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <ostd/Color.hpp>
+#include <ostd/data_types/Color.hpp>
-#include <ostd/Geometry.hpp>
+#include <ostd/math/Geometry.hpp>
-#include <ostd/Types.hpp>
+#include <ostd/data_types/Types.hpp>
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
-#include <ostd/IOHandlers.hpp>
+#include <ostd/io/IOHandlers.hpp>
 #include <ogfx/WindowBase.hpp>
 #include <ogfx/BasicRenderer.hpp>
 #include <ogfx/RawTextInput.hpp>

src/debugger/DisassemblyLoader.cpp

@@ -1,7 +1,7 @@
 #include "DisassemblyLoader.hpp"
 
-#include <ostd/File.hpp>
+#include <ostd/io/File.hpp>
-#include <ostd/Serial.hpp>
+#include <ostd/io/Serial.hpp>
 
 #include <algorithm>
 

src/debugger/DisassemblyLoader.hpp

@@ -2,7 +2,7 @@
 
 #include "../assembler/Assembler.hpp"
 
-#include <ostd/Types.hpp>
+#include <ostd/data_types/Types.hpp>
 
 namespace dragon
 {

src/debugger/debugger_main.cpp

@@ -1,54 +1,56 @@
-// #include "Debugger.hpp"
+#include <ostd/utils/Defines.hpp>
+#include "Debugger.hpp"
 #include "../runtime/DragonRuntime.hpp"
-#include "DebuggerNew.hpp"
+// #include "DebuggerNew.hpp"
-#include <ostd/Signals.hpp>
+#include <ostd/utils/Signals.hpp>
 
 int main(int argc, char** argv)
 {
-	// //Loading commandline arguments
-	// int32_t rValue = dragon::Debugger::loadArguments(argc, argv);
-	// if (rValue == dragon::DragonRuntime::RETURN_VAL_CLOSE_DEBUGGER)
-	// 	return 0;
-	// if (rValue != 0) return rValue;
-
-	// //Initializing the runtime
-	// rValue = dragon::Debugger::initRuntime();
-	// if (rValue == dragon::DragonRuntime::RETURN_VAL_CLOSE_DEBUGGER)
-	// 	return 0;
-	// if (rValue != 0) return rValue;
-
-	// //Running top-level prompt
-	// rValue = dragon::Debugger::topLevelPrompt();
-	// if (rValue == dragon::DragonRuntime::RETURN_VAL_CLOSE_DEBUGGER)
-	// 	return 0;
-	// if (rValue != 0) return rValue;
-
-	// //Executing the runtime
-	// return dragon::Debugger::executeRuntime();
-
-
 	ostd::SignalHandler::init();
 
-	dragon::DebuggerNew debuggerInstance;
-	debuggerInstance.initialize(2000, 1090, "DragonVM Live Debugger");
-	debuggerInstance.setClearColor({ 5, 0, 0 });
-
 	//Loading commandline arguments
-	int32_t rValue = debuggerInstance.loadArguments(argc, argv);
+	int32_t rValue = dragon::Debugger::loadArguments(argc, argv);
 	if (rValue == dragon::DragonRuntime::RETURN_VAL_CLOSE_DEBUGGER)
 		return 0;
 	if (rValue != 0) return rValue;
 
 	//Initializing the runtime
-	rValue = debuggerInstance.initRuntime();
+	rValue = dragon::Debugger::initRuntime();
 	if (rValue == dragon::DragonRuntime::RETURN_VAL_CLOSE_DEBUGGER)
 		return 0;
 	if (rValue != 0) return rValue;
 
-	while (debuggerInstance.isRunning())
+	//Running top-level prompt
-	{
+	rValue = dragon::Debugger::topLevelPrompt();
-		debuggerInstance.update();
+	if (rValue == dragon::DragonRuntime::RETURN_VAL_CLOSE_DEBUGGER)
-	}
+		return 0;
+	if (rValue != 0) return rValue;
+
+	//Executing the runtime
+	return dragon::Debugger::executeRuntime();
+
+
+
+	// dragon::DebuggerNew debuggerInstance;
+	// debuggerInstance.initialize(2000, 1090, "DragonVM Live Debugger");
+	// debuggerInstance.setClearColor({ 5, 0, 0 });
+
+	// //Loading commandline arguments
+	// int32_t rValue = debuggerInstance.loadArguments(argc, argv);
+	// if (rValue == dragon::DragonRuntime::RETURN_VAL_CLOSE_DEBUGGER)
+	// 	return 0;
+	// if (rValue != 0) return rValue;
+
+	// //Initializing the runtime
+	// rValue = debuggerInstance.initRuntime();
+	// if (rValue == dragon::DragonRuntime::RETURN_VAL_CLOSE_DEBUGGER)
+	// 	return 0;
+	// if (rValue != 0) return rValue;
+
+	// while (debuggerInstance.isRunning())
+	// {
+	// 	debuggerInstance.update();
+	// }
 
 	return 0;
 }

src/hardware/IMemoryDevice.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ostd/BaseObject.hpp>
+#include <ostd/data_types/BaseObject.hpp>
 
 namespace dragon
 {

src/hardware/MemoryMapper.cpp

@@ -1,5 +1,7 @@
 #include "MemoryMapper.hpp"
-#include <ostd/Utils.hpp>
+#include <ostd/io/Serial.hpp>
+#include <ostd/data_types/Types.hpp>
+#include <ostd/utils/Utils.hpp>
 
 #include "../tools/GlobalData.hpp"
 

src/hardware/MemoryMapper.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "IMemoryDevice.hpp"
-#include <ostd/String.hpp>
+#include <ostd/string/String.hpp>
 #include <vector>
 
 namespace dragon

src/hardware/VirtualCPU.cpp

@@ -1,8 +1,8 @@
 #include "VirtualCPU.hpp"
 #include "../tools/GlobalData.hpp"
 
-#include <ostd/Defines.hpp>
+#include <iostream>
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
 
 #include "../runtime/DragonRuntime.hpp"
 
@@ -209,6 +209,7 @@ namespace dragon
 			m_currentExtension = nullptr;
 			m_currentExtInst = 0x00;
 			m_isDebugBreakPoint = false;
+			m_ramDumped = false;
 			m_isOffsetAddressingEnabled = readFlag(data::Flags::OffsetModeEnabled);
 			if (m_isOffsetAddressingEnabled)
 				m_currentOffset = readRegister(data::Registers::OFFSET);
@@ -230,6 +231,13 @@ namespace dragon
 					m_isDebugBreakPoint = true;
 				}
 				break;
+				case data::OpCodes::DEBUG_DumpRAM:
+				{
+					ostd::Utils::saveByteStreamToFile(*DragonRuntime::ram.getByteStream(), "ram_dump.bin");
+					m_isDebugBreakPoint = true;
+					m_ramDumped = true;
+				}
+				break;
 				case data::OpCodes::BIOSModeImm:
 				{
 					uint16_t tmpAddr = m_currentAddr;
@@ -796,9 +804,17 @@ namespace dragon
 				break;
 				case data::OpCodes::CallImm:
 				{
+					bool test = false;
+					if (readRegister(data::Registers::IP) == 0x2CF1)
+						test = true;
 					uint16_t subroutineAddr = fetch16();
 					pushStackFrame();
 					writeRegister16(data::Registers::IP, subroutineAddr);
+					if (test)
+					{
+						std::cout << ostd::Utils::getHexStr(subroutineAddr, true, 2) << "\n";
+						std::cin.get();
+					}
 					m_subroutineCounter++;
 				}
 				break;
@@ -820,6 +836,11 @@ namespace dragon
 				break;
 				case data::OpCodes::ArgReg:
 				{
+					if (isInDebugBreakPoint())
+					{
+						std::cout << ostd::Utils::getHexStr(readRegister(data::Registers::IP));
+						std::cin.get();
+					}
 					uint8_t regAddr = fetch8();
 					if (!isInSubRoutine()) break;
 					int16_t pp_val = readRegister(data::Registers::PP);

src/hardware/VirtualCPU.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <ostd/Types.hpp>
+#include <ostd/data_types/Types.hpp>
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
-#include <ostd/Bitfields.hpp>
+#include <ostd/data_types/Bitfields.hpp>
 #include "IMemoryDevice.hpp"
 
 #include "../debugger/Debugger.hpp"
@@ -43,6 +43,7 @@ namespace dragon
 				inline bool isHalted(void) const { return m_halt; }
 				inline uint8_t getCurrentInstruction(void) const { return m_currentInst; }
 				inline bool isInDebugBreakPoint(void) const { return m_isDebugBreakPoint; }
+				inline bool isRamDumped(void) const { return m_ramDumped; }
 				inline bool isInBIOSMOde(void) const { return m_biosMode; }
 				inline bool isInSubRoutine(void) const { return m_subroutineCounter > 0; }
 				inline int32_t getSubRoutineCounter(void) const { return m_subroutineCounter; }
@@ -65,6 +66,7 @@ namespace dragon
 				bool m_biosMode { true };
 				int32_t m_interruptHandlerCount { 0 };
 				bool m_isDebugBreakPoint { false };
+				bool m_ramDumped { false };
 				bool m_debugModeEnabled { false };
 				int32_t m_subroutineCounter { 0 };
 				bool m_debugProfilerStarted { false };

src/hardware/VirtualHardDrive.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <fstream>
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
 
 namespace dragon
 {

src/hardware/VirtualIODevices.cpp

@@ -1,5 +1,5 @@
 #include "VirtualIODevices.hpp"
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
 
 #include "VirtualHardDrive.hpp"
 #include "MemoryMapper.hpp"

src/hardware/VirtualIODevices.hpp

@@ -2,8 +2,9 @@
 
 #include "IMemoryDevice.hpp"
 #include "../tools/GlobalData.hpp"
-#include <ostd/Serial.hpp>
+#include <ostd/io/Serial.hpp>
 #include <fstream>
+#include <unordered_map>
 
 namespace dragon
 {

src/hardware/VirtualMMU.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ostd/Serial.hpp>
+#include <ostd/io/Serial.hpp>
 
 namespace dragon
 {

src/hardware/VirtualRAM.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ostd/Serial.hpp>
+#include <ostd/io/Serial.hpp>
 #include "IMemoryDevice.hpp"
 
 namespace dragon

src/runtime/ConfigLoader.cpp

@@ -1,6 +1,6 @@
 #include "ConfigLoader.hpp"
-#include <ostd/File.hpp>
+#include <ostd/io/File.hpp>
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
 #include "../hardware/CPUExtensions.hpp"
 
 namespace dragon

src/runtime/ConfigLoader.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ostd/Color.hpp>
+#include <ostd/data_types/Color.hpp>
 #include <map>
 #include "../tools/GlobalData.hpp"
 

src/runtime/DragonRuntime.cpp

@@ -1,5 +1,4 @@
 #include "DragonRuntime.hpp"
-#include <ostd/Defines.hpp>
 #include <ogfx/PixelRenderer.hpp>
 
 namespace dragon
@@ -386,7 +385,7 @@ namespace dragon
 				// out.fg(ostd::ConsoleColors::Red).p(getAvgClockSpeed()).nl().reset();
 				acc = 0;
 			}
-			if (acc2 == (1000 / screenRedrawRate))
+			if (acc2 == (1000.0 / screenRedrawRate))
 			{
 				vDisplay.redrawScreen();
 				acc2 = 0;
@@ -407,7 +406,7 @@ namespace dragon
 		bool running = cpu.execute() && vDisplay.isRunning();
 		uint8_t screenRedrawRate = vCMOS.read8(data::CMOSRegisters::ScreenRedrawRate);
 		vDisplay.update();
-		if (s_enableScreenRedrawDelay && s_stepAcc2 == (1000 / screenRedrawRate))
+		if (s_enableScreenRedrawDelay && s_stepAcc2 == (1000.0 / screenRedrawRate))
 		{
 			vDisplay.redrawScreen();
 			s_stepAcc2 = 0;

src/runtime/runtime_main.cpp

@@ -1,4 +1,5 @@
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Defines.hpp>
+#include <ostd/utils/Utils.hpp>
 #include "DragonRuntime.hpp"
 
 int main(int argc, char** argv)

src/tools/GlobalData.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ostd/Types.hpp>
+#include <ostd/data_types/Types.hpp>
-#include <ostd/Color.hpp>
+#include <ostd/data_types/Color.hpp>
 
 namespace dragon
 {
@@ -294,6 +294,7 @@ namespace dragon
 				inline static constexpr uint8_t BIOSModeImm = 0x02;
 				inline static constexpr uint8_t DEBUG_StartProfile = 0x03;
 				inline static constexpr uint8_t DEBUG_StopProfile = 0x04;
+				inline static constexpr uint8_t DEBUG_DumpRAM = 0x05;
 
 				inline static constexpr uint8_t MovImmReg = 0x10;
 				inline static constexpr uint8_t MovRegReg = 0x11;

src/tools/Tools.cpp

@@ -1,13 +1,13 @@
 #include "Tools.hpp"
 
-#include <ostd/Color.hpp>
+#include <ostd/data_types/Color.hpp>
-#include <ostd/IOHandlers.hpp>
+#include <ostd/io/IOHandlers.hpp>
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
 #include <fstream>
 #include "../hardware/VirtualHardDrive.hpp"
 #include "GlobalData.hpp"
 #include "debugger/DisassemblyLoader.hpp"
-#include <ostd/Serial.hpp>
+#include <ostd/io/Serial.hpp>
 
 namespace dragon
 {

src/tools/Tools.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ostd/IOHandlers.hpp>
+#include <ostd/io/IOHandlers.hpp>
 #include "GlobalData.hpp"
 #include <unordered_map>
 

src/tools/Utils.cpp

@@ -1,7 +1,7 @@
 #include "Utils.hpp"
-#include <ostd/Serial.hpp>
+#include <ostd/io/Serial.hpp>
-#include <ostd/Utils.hpp>
+#include <ostd/utils/Utils.hpp>
-#include <ostd/Random.hpp>
+#include <ostd/math/Random.hpp>
 
 namespace dragon
 {

src/tools/Utils.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <ostd/Types.hpp>
+#include <ostd/data_types/Types.hpp>
-#include <ostd/String.hpp>
+#include <ostd/string/String.hpp>
 
 namespace dragon
 {

src/tools/tools_main.cpp

@@ -1,3 +1,4 @@
+#include <ostd/utils/Defines.hpp>
 #include "Tools.hpp"
 
 int main(int argc, char** argv)