Merge pull request #48 from maxdev1/x86_64

Port to x86_64, switching from GRUB to Limine

Author: maxdev1

.gitignore

@@ -39,6 +39,12 @@ documentation/out/*
 target/iso/boot/kernel
 target/iso/boot/loader
 target/iso/boot/ramdisk
+target/iso/boot/limine/limine-*.sys
+target/iso/boot/limine/limine-*.bin
+target/limine-*/*
+target/limine-*.tar.gz
+
+node_modules
 
 sysroot/system/include
 sysroot/system/lib/*

README.md

@@ -29,7 +29,7 @@ VMSVGA graphics adapter enabled for better performance.
 Afterwards, the `target` folder will contain the bootable ISO image.
 
 ## Features
-* x86-based micro-kernel
+* x86_64-based micro-kernel
 * SMP multi-processor support
 * Comprehensive kernel interaction library (libapi)
 * Own C standard library (libc)

applications/ahcidriver/src/ahcidriver.cpp

@@ -79,7 +79,7 @@ bool ahciDriverIdentifyController()
 		   devices[i].subclassCode == PCI_01_SUBCLASS_SATA &&
 		   devices[i].progIf == PCI_01_06_PROGIF_AHCI)
 		{
-			uint32_t bar;
+			g_address bar;
 			if(!pciDriverReadBAR(devices[i].deviceAddress, 5, &bar))
 			{
 				klog("Failed to read BAR5 from PCI device %x", devices[i].deviceAddress);

applications/devicemanager/src/manager.cpp

@@ -89,8 +89,8 @@ void _deviceManagerCheckPciDevices()
 	}
 	else
 	{
-		klog("starting VBE driver");
-		g_spawn("/applications/vbedriver.bin", "", "", G_SECURITY_LEVEL_DRIVER);
+		klog("starting EFI FB driver");
+		g_spawn("/applications/efifbdriver.bin", "", "", G_SECURITY_LEVEL_DRIVER);
 	}
 }
 

applications/vbedriver/build.sh applications/efifbdriver/build.shapplications/vbedriver/build.sh renamed to applications/efifbdriver/build.sh

@@ -6,7 +6,7 @@ fi
 . "$ROOT/ghost.sh"
 
 # Build configuration
-ARTIFACT_NAME="vbedriver.bin"
+ARTIFACT_NAME="efifbdriver.bin"
 LDFLAGS="-ldevice"
 
 # Include application build tasks

applications/efifbdriver/src/efifbdriver.cpp

@@ -0,0 +1,98 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *                                                                           *
+ *  Ghost, a micro-kernel based operating system for the x86 architecture    *
+ *  Copyright (C) 2015, Max Schlüssel <[email protected]>                     *
+ *                                                                           *
+ *  This program is free software: you can redistribute it and/or modify     *
+ *  it under the terms of the GNU General Public License as published by     *
+ *  the Free Software Foundation, either version 3 of the License, or        *
+ *  (at your option) any later version.                                      *
+ *                                                                           *
+ *  This program is distributed in the hope that it will be useful,          *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            *
+ *  GNU General Public License for more details.                             *
+ *                                                                           *
+ *  You should have received a copy of the GNU General Public License        *
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *                                                                           *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "efifbdriver.hpp"
+
+#include <libdevice/manager.hpp>
+#include <ghost.h>
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+g_device_id deviceId;
+
+int main()
+{
+	g_task_register_name("efifbdriver");
+
+	if(!deviceManagerRegisterDevice(G_DEVICE_TYPE_VIDEO, g_get_tid(), &deviceId))
+	{
+		klog("failed to register device with device manager");
+		return -1;
+	}
+	klog("registered EFI FB device %i", deviceId);
+
+	efifbDriverReceiveMessages();
+	return 0;
+}
+
+void efifbDriverReceiveMessages()
+{
+	size_t buflen = sizeof(g_message_header) + 1024;
+	uint8_t buf[buflen];
+
+	for(;;)
+	{
+		auto status = g_receive_message(buf, buflen);
+		if(status != G_MESSAGE_RECEIVE_STATUS_SUCCESSFUL)
+		{
+			continue;
+		}
+
+		g_message_header* header = (g_message_header*) buf;
+		g_video_request_header* request = (g_video_request_header*) G_MESSAGE_CONTENT(buf);
+
+		if(request->command == G_VIDEO_COMMAND_SET_MODE)
+		{
+			efifbDriverHandleCommandSetMode((g_video_set_mode_request*) request, header->sender, header->transaction);
+		}
+		else
+		{
+			klog("efifbdriver: received unknown command %i from task %i", request->command, header->sender);
+		}
+	}
+}
+
+void efifbDriverHandleCommandSetMode(g_video_set_mode_request* request, g_tid requestingTaskId,
+                                     g_message_transaction requestTransaction)
+{
+	g_address lfb;
+	uint16_t resX;
+	uint16_t resY;
+	uint16_t bpp;
+	uint32_t pitch;
+	g_get_efi_framebuffer(&lfb, &resX, &resY, &bpp, &pitch);
+
+	uint64_t lfbSize = pitch * resY;
+	auto localMapped = g_map_mmio((void*) lfb, lfbSize);
+	// TODO: This is kind of unneccessary, we don't want to map it here
+	void* addressInRequestersSpace = g_share_mem((void*) localMapped, lfbSize, requestingTaskId);
+
+	g_video_set_mode_response response{};
+	response.status = G_VIDEO_SET_MODE_STATUS_SUCCESS;
+	response.mode_info.lfb = (g_address) addressInRequestersSpace;
+	response.mode_info.resX = resX;
+	response.mode_info.resY = resY;
+	response.mode_info.bpp = (uint8_t) bpp;
+	response.mode_info.bpsl = (uint16_t) pitch;
+	response.mode_info.explicit_update = false;
+	g_send_message_t(requestingTaskId, &response, sizeof(g_video_set_mode_response), requestTransaction);
+}

kernel/src/shared/memory/gdt.cpp …ications/efifbdriver/src/efifbdriver.hppkernel/src/shared/memory/gdt.cpp renamed to applications/efifbdriver/src/efifbdriver.hpp kernel/src/shared/memory/gdt.cpp renamed to applications/efifbdriver/src/efifbdriver.hpp

@@ -18,18 +18,23 @@
  *                                                                           *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "shared/memory/gdt.hpp"
+#ifndef __EFIFBDRIVER__
+#define __EFIFBDRIVER__
 
-void gdtCreateGate(g_gdt_entry* entry, uint32_t base, uint32_t limit, uint8_t access, uint8_t granularity)
-{
-	entry->baseLow = (base & 0xFFFF);
-	entry->baseMiddle = (base >> 16) & 0xFF;
-	entry->baseHigh = (base >> 24) & 0xFF;
+#include <libvideo/videodriver.hpp>
 
-	entry->limitLow = (limit & 0xFFFF);
-	entry->limitHigh = limit >> 16;
+#include <cstdint>
+#include <ghost.h>
 
-	entry->granularity = granularity;
+/**
+ * Main loop receiving messages from other processes to do something.
+ */
+void efifbDriverReceiveMessages();
 
-	entry->access = access;
-}
+/**
+ * Handles a set-mode command.
+ */
+void efifbDriverHandleCommandSetMode(g_video_set_mode_request* request, g_tid requestingTaskId,
+                                     g_message_transaction requestTransaction);
+
+#endif

applications/gsh/src/gosh.cpp

@@ -28,6 +28,8 @@
 #include <string.h>
 #include <string>
 
+#include <ghost/tasks/types.h>
+
 char* cwdbuf = 0;
 
 std::vector<std::string> gshAutocomplete(std::string toComplete)
@@ -306,6 +308,12 @@ bool gshHandleBuiltin(program_call_t* call)
 		return true;
 	}
 
+	if(call->program == "bg")
+	{
+		g_spawn(call->arguments.at(0).c_str(), "", "", G_SECURITY_LEVEL_APPLICATION);
+		return true;
+	}
+
 	if(call->program == "clear" || call->program == "cls")
 	{
 		g_terminal::clear();

applications/libpci/inc/libpci/driver.hpp

@@ -140,7 +140,7 @@ struct g_pci_enable_resource_access_response
 /**
  * Read a BAR from a device.
  */
-bool pciDriverReadBAR(g_pci_device_address address, uint8_t bar, uint32_t* outValue);
+bool pciDriverReadBAR(g_pci_device_address address, uint8_t bar, g_address* outValue);
 
 struct g_pci_read_bar_request
 {
@@ -152,13 +152,13 @@ struct g_pci_read_bar_request
 struct g_pci_read_bar_response
 {
     bool successful;
-    uint32_t value;
+    g_address value;
 }__attribute__((packed));
 
 /**
  * Read a BAR size from a device.
  */
-bool pciDriverReadBARSize(g_pci_device_address address, uint8_t bar, uint32_t* outValue);
+bool pciDriverReadBARSize(g_pci_device_address address, uint8_t bar, g_address* outValue);
 
 struct g_pci_read_bar_size_request
 {
@@ -170,7 +170,7 @@ struct g_pci_read_bar_size_request
 struct g_pci_read_bar_size_response
 {
     bool successful;
-    uint32_t value;
+    g_address value;
 }__attribute__((packed));
 
 #endif

applications/libpci/src/driver.cpp

@@ -132,7 +132,7 @@ bool pciDriverEnableResourceAccess(g_pci_device_address address, bool enabled)
 	return success;
 }
 
-bool pciDriverReadBAR(g_pci_device_address address, uint8_t bar, uint32_t* outValue)
+bool pciDriverReadBAR(g_pci_device_address address, uint8_t bar, g_address* outValue)
 {
 	g_tid driverTid = g_task_await_by_name(G_PCI_DRIVER_NAME);
 
@@ -156,7 +156,7 @@ bool pciDriverReadBAR(g_pci_device_address address, uint8_t bar, uint32_t* outVa
 	return success;
 }
 
-bool pciDriverReadBARSize(g_pci_device_address address, uint8_t bar, uint32_t* outValue)
+bool pciDriverReadBARSize(g_pci_device_address address, uint8_t bar, g_address* outValue)
 {
 	g_tid driverTid = g_task_await_by_name(G_PCI_DRIVER_NAME);