* partialy Implemented task changing

* Added new command tsk

Author: Arun007coder

.github/workflows/BASIC.yml

@@ -1,38 +1,29 @@
-name: Build ISO
-
 on:
   push:
     branches: [ master ]
   pull_request:
     branches: [ master ]
 
 jobs:
-  build:
+  build_stable:
 
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
     - name: install tools
       run: make prep
-    - name: Install grub
-      run: make Install-Grub-BIOS
     - name: make move
-      run: make move
+      run: make move GRUB=pt
 
     - name: Upload Build files
       uses: actions/upload-artifact@v2
       with: 
-        name: SectorOS_Artifact-Build
-        path: Build_files
-        
-    - name: Create release
-      uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "latest"
-        prerelease: false
-        title: Automatic Release Commit
-        files: |
-          Build_files/*.iso
-          Build_files/*.bin
+        name: SectorOS_ISO
+        path: Build_files/SectorOS.iso
+
+    - name: Upload Build files
+      uses: actions/upload-artifact@v2
+      with: 
+        name: SectorOS_Kernel
+        path: Build_files/SectorOS_Kernel.bin

.github/workflows/c-cpp.yml

@@ -173,17 +173,6 @@ uint32_t InterruptManager::DoHandleInterrupt(uint8_t interrupt, uint32_t esp)
         printf(foo);
         printHex(interrupt);
     }
-    /*
-    else if(interrupt == 0x0D)
-    {
-        printf("\5");
-        printf("A Kernel Panic Occured. HALTING...\nSYSMSG:: EXCEPTION: GENERAL PROTECTION FAULT\n");
-        printf("An exception has occured in the system during execution which cannot fix itself.The general protection fault is called when a function is improperly executed which leads to memory corruption.Restarting may solve thr problem.\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
-        printf("Execption stack pointer = 0x"); printHex(esp);
-        printf("\nExecption interrupt number = 0x"); printHex(interrupt);
-        Power.halt();
-    }
-    */
     else if(interrupt = 0x20)
     {
         if(isTaskAllowed)
@@ -209,3 +198,15 @@ void InterruptManager::UseMultiTask(int OPT)
     else if(OPT == 0)
         isTaskAllowed = false;
 }
+
+/*
+void InterruptManager::HandleException0x0D()
+{
+    printf("\5");
+    printf("A Kernel Panic Occured. HALTING...\nSYSMSG:: EXCEPTION: GENERAL PROTECTION FAULT\n");
+    printf("An exception has occured in the system during execution which cannot fix itself.The general protection fault is called when a function is improperly executed which leads to memory corruption.Restarting may solve thr problem.\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+    //printf("Extended stack pointer = 0x"); printHex(esp);
+    //printf("\nExecption interrupt number = 0x"); printHex(interrupt);
+    Power.halt();
+}
+*/

CPU/Interrupts.cpp

@@ -10,6 +10,10 @@ void PrintDate();
 char* INTTOCHARPOINT(int num);
 void ColourPrint(int type);
 bool txtcolor;
+bool isESPChanged = false;
+GlobalDescriptorTable gdt;
+void taskA();
+void taskB();
 const void* mb;
 void PrintHDD();
 void detect_cpu();
@@ -26,6 +30,10 @@ DataPort(0x60),
 CommandPort(0x64)
 {
     isTxtMode = false;
+    Task task1(&gdt, taskA);
+    Task task2(&gdt, taskB);
+    taskManager.AddTask(&task1);
+    taskManager.AddTask(&task2);
 }
 
 KeyboardDriver::~KeyboardDriver()
@@ -47,6 +55,17 @@ void KeyboardDriver::activate()
 
 uint32_t KeyboardDriver::HandleInterrupt(uint32_t esp)
 {
+    esp2 = esp;
+    if(isESPChanged)
+    {
+        printf("\n");
+        printHex(esp);
+        printf(":");
+        printHex(esp1);
+        printf("task changed");
+        isESPChanged = false;
+        return esp1;
+    }
     uint8_t key = DataPort.ReadFromPort(); // The variable where a single keystroke is stored
     if(key < 0x80 & key != 0x3A & key != 0x2A & key != 0x2A & key != 0x36 & key != 0x3A & key != 0x0E & key != 0x38 & key != 0x1D ){
         key_buffer[keybufferpoint] = KeycodeToASCII(key);
@@ -309,7 +328,7 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
         else if (key_buffer[5] == "3")
             printf("Help page 3:\nspi : To print the data in serial port 0x3F8.\nspo : To write data to serial port 0x3F8.\nsysinfo [option] : To get info about system.\nvga : To use experimental vga graphics.");
         else if (key_buffer[5] == "4")
-            printf("Help page 4:\nlspt: To list partitions in a drive.");
+            printf("Help page 4:\nlspt: To list partitions in a drive.\ntsk:to change instance.[EXPERIMENTAL]");
         else
             printf("Help page 1:\necho <message> : to print the message in the console \nhelp : to show this message \nclear : to clear the screen \nsd <options> : controls the power of the computer ");
     }
@@ -461,6 +480,13 @@ void KeyboardDriver::CommandInterpreter() // SOSH v1.0.3 [SectorOS SHell]. 11 Co
         COMNAME = "lspt";
         PrintPartitions();
     }
+    else if(key_buffer[0] == "t" && key_buffer[1] == "s" && key_buffer[2] == "k")
+    {
+        esp1 = (uint32_t)taskManager.Schedule((CPUState*)esp1);
+        printf("esp1 is :"); printHex(esp1); printf("\n");
+        printf("esp2 is :"); printHex(esp2);
+        isESPChanged = true;
+    }
     else
     {
         printf("Unknown Command. Type help in console to get all the commands");

Drivers/Keyboard.cpp

@@ -29,6 +29,9 @@ class KeyboardDriver : public InterruptHandler, public Driver // Driver for keyb
     ~KeyboardDriver();
     virtual uint32_t HandleInterrupt(uint32_t esp);
     // To change the keycode to ascii to write it into string
+    TaskManager taskManager;
+    uint32_t esp1;
+    uint32_t esp2;
     char* KeycodeToASCII(uint8_t Keycode);
     char* key_buffer[256]; // To Save the keystrokes in memory to use them later. Max number keystroke to save in the buffer is 256 Chars
     // To clear the keystrokes in the keyboard buffer

Drivers/Keyboard.h

@@ -4,11 +4,11 @@
 inline char* OS_NAME = "SectorOS";
 
 inline char* KERNEL_NAME = "SectorOS";
-inline char* KERNEL_VERSION = "V2.1.0";
-inline char* KERNEL_BUILD = "Build: 2021-11-25";
+inline char* KERNEL_VERSION = "V2.1.3";
+inline char* KERNEL_BUILD = "Build: 2021-12-02";
 inline char* KERNEL_ARCH = "x86";
 
 inline char* SHELL_NAME = "SOSH";
-inline char* SHELL_VER = "V1.0.7";
+inline char* SHELL_VER = "V1.0.8";
 
 #endif

Includes/Public_VAR.h

@@ -3,6 +3,7 @@
 #include"../CPU/Interrupts.h"
 #include "../Drivers/IOPorts.h"
 #include "../Drivers/Keyboard.h"
+#include "../Includes/multiboot.h"
 #include "../Drivers/Mouse.h"
 #include "../Drivers/Driver.h"
 #include "../Drivers/RTC.h"
@@ -22,6 +23,9 @@ static bool useMouse = true;
 bool isused;
 bool isTxtMode;
 extern const void* mb;
+uint32_t mm;
+extern GlobalDescriptorTable gdt;
+extern TaskManager taskManager;
 AdvancedTechnologyAttachment ata0m(0x1F0, true);
 AdvancedTechnologyAttachment ata0s(0x1F0, false);
 
@@ -703,29 +707,40 @@ class MouseToConsole : public MouseEventHandler
 
 };
 
-void taskA()
+void taskB()
 {
-    while(1)
-    {
-        printf("A");
-    }
+    printf("Welcome to SectorOS Shell instance 2\nRun help to get the list of commands which is implemented \n \n");
+    TaskManager taskManager;
+    GlobalDescriptorTable gdt;
+    InterruptManager interrupts(0x20, &gdt, &taskManager);
+    KeyboardDriver boardDriver(&interrupts);
+    DriverManager drvmgr;
+    drvmgr.AddDriver(&boardDriver);
+    PCI PCICONT;
+    PCICONT.SelectDrivers(&drvmgr, &interrupts);
+    drvmgr.activateall();
+    printf("#:");
+    while (1);
 }
-void NewInstance()
-{
-    printf("\5");
-
-    printf("Welcome to SectorOS Monolithic kernel ");PrintDate();printf("                    Type: Shell\nhttps://github.com/Arun007coder/SectorOS \n");
-
-    printf("Instance 2\n");
 
-    printf("Initializing SOSH V1.0.2\n\n");
-
-    printf("Welcome to SectorOS Shell\nRun help to get the list of commands which is implemented \n \n");
-
-    printf("$: ");
-    while(1);
+void taskA()
+{
+    printf("Welcome to SectorOS Shell instance 2\nRun help to get the list of commands which is implemented \n \n");
+    TaskManager taskManager;
+    GlobalDescriptorTable gdt;
+    InterruptManager interrupts(0x20, &gdt, &taskManager);
+    KeyboardDriver boardDriver(&interrupts);
+    DriverManager drvmgr;
+    drvmgr.AddDriver(&boardDriver);
+    PCI PCICONT;
+    PCICONT.SelectDrivers(&drvmgr, &interrupts);
+    drvmgr.activateall();
+    printf("$:");
+    while (1);
+    
 }
 
+
 typedef void (*constructor)();
 extern "C" constructor start_ctors;
 extern "C" constructor end_ctors;
@@ -737,8 +752,10 @@ extern "C" void callConstructors()
 
 
 
-extern "C" void kernelMain(const void* multiboot_structure, uint32_t /*multiboot_magic*/)
+extern "C" void kernelMain(const void* multiboot_structure, uint32_t multiboot_m)
 {
+    TaskManager taskManager;
+    uint32_t mm = multiboot_m;
     printf("Initializing SectorOS Kernel ");printf(KERNEL_VERSION); printf(" "); printf(KERNEL_BUILD); printf("....\n");
     SerialPort sp;
     sp.INITSerial();
@@ -754,15 +771,6 @@ extern "C" void kernelMain(const void* multiboot_structure, uint32_t /*multiboot
 
     GlobalDescriptorTable gdt;
 
-
-    TaskManager taskManager;
-    /*
-    Task task1(&gdt, taskA);
-    Task task2(&gdt, NewInstance);
-    taskManager.AddTask(&task1);
-    taskManager.AddTask(&task2);
-    */
-
     InterruptManager interrupts(0x20, &gdt, &taskManager);
 
     DriverManager drvmgr;
@@ -829,6 +837,8 @@ extern "C" void kernelMain(const void* multiboot_structure, uint32_t /*multiboot
 
     printf("\n\n");
 
+    
+
     printf("Welcome to SectorOS Shell\nRun help to get the list of commands which is implemented \n \n");
 
     //ata0s.Read28(4);