tmp push

Author: Qwinci

.clang-tidy

@@ -24,7 +24,7 @@ bugprone-multiple-statement-macro,
 bugprone-no-escape,
 bugprone-parent-virtual-call,
 bugprone-posix-return,
-bugprone-reserved-identifier,
+-bugprone-reserved-identifier,
 bugprone-sizeof-container,
 bugprone-sizeof-expression,
 bugprone-spuriously-wake-up-functions,
@@ -143,4 +143,9 @@ readability-static-accessed-through-instance,
 readability-static-definition-in-anonymous-namespace,
 readability-string-compare,
 readability-uniqueptr-delete-release,
-readability-use-anyofallof'
+readability-use-anyofallof'
+#CheckOptions:
+#  - key: bugprone-assert-side-effect.AssertMacros
+#    value: 'assert'
+#  - key: bugprone-assert-side-effect.CheckFunctionCalls
+#    value: 'true'

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.27)
-project(crescent CXX ASM)
+project(crescent C CXX ASM)
 
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -61,8 +61,8 @@ if(ARCH STREQUAL "x86_64")
 
 	target_link_libraries(crescent PRIVATE qacpi::qacpi qacpi::events)
 elseif(ARCH STREQUAL "aarch64")
-	target_compile_options(crescent PRIVATE -fno-PIE -mno-unaligned-access)
-	target_link_options(crescent PRIVATE -T ${PROJECT_SOURCE_DIR}/lds/aarch64.ld)
+	target_compile_options(crescent PRIVATE -fPIE)
+	target_link_options(crescent PRIVATE -T ${PROJECT_SOURCE_DIR}/lds/aarch64.ld -static-pie)
 	target_compile_definitions(crescent PRIVATE ARCH_AARCH64)
 
 	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -87,13 +87,17 @@ target_sources(crescent PUBLIC FILE_SET HEADERS
 	FILES
 
 	include/crescent/aarch64/arch_syscall.h
+	include/crescent/aarch64/posix_arch_syscall.h
 	include/crescent/x86/arch_syscall.h
+	include/crescent/x86/posix_arch_syscall.h
 	include/crescent/devlink.h
 	include/crescent/event.h
 	include/crescent/evm.h
 	include/crescent/socket.h
 	include/crescent/syscall.h
 	include/crescent/syscalls.h
+	include/crescent/posix_syscall.h
+	include/crescent/posix_syscalls.h
 	include/crescent/time.h
 )
 

CMakeOptions.cmake

@@ -20,5 +20,17 @@ if(CONFIG_PCI AND CONFIG_USB_XHCI)
 	option(CONFIG_XHCI_PCI "Enable xhci pci support" ON)
 endif()
 
+if(CONFIG_DTB AND CONFIG_USB_XHCI)
+	option(CONFIG_XHCI_DTB "Enable xhci dtb support" ON)
+endif()
+
+option(CONFIG_UFS "Enable ufs support" ON)
+if(CONFIG_PCI AND CONFIG_UFS)
+	option(CONFIG_UFS_PCI "Enable ufs pci support" ON)
+endif()
+if(CONFIG_DTB AND CONFIG_UFS)
+	option(CONFIG_UFS_DTB "Enable ufs dtb support" ON)
+endif()
+
 configure_file(config.hpp.in config.hpp @ONLY)
 target_include_directories(crescent PRIVATE "${CMAKE_BINARY_DIR}")

apps/CMakeLists.txt

@@ -15,6 +15,7 @@ endmacro()
 
 add_subdirectory(desktop)
 add_subdirectory(console)
+add_subdirectory(init)
 
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
 	add_subdirectory(evm)

apps/console/src/main.cpp

@@ -11,6 +11,21 @@ namespace protocol = windower::protocol;
 using namespace std::literals;
 
 int main() {
+	CrescentHandle bash_stdout_read_handle;
+	CrescentHandle bash_stdout_write_handle;
+	sys_pipe_create(bash_stdout_read_handle, bash_stdout_write_handle, 0x1000, OPEN_NONBLOCK, 0);
+
+	CrescentHandle bash_handle;
+	ProcessCreateInfo bash_info {
+		.args = nullptr,
+		.arg_count = 0,
+		.stdin_handle = STDIN_HANDLE,
+		.stdout_handle = bash_stdout_write_handle,
+		.stderr_handle = STDERR_HANDLE,
+		.flags = PROCESS_STD_HANDLES
+	};
+	sys_process_create(bash_handle, "/usr/bin/bash", sizeof("/usr/bin/bash") - 1, bash_info);
+
 	uint32_t colors[] {
 		0xFF0000,
 		0x00FF00,
@@ -43,6 +58,13 @@ int main() {
 	window.redraw();
 
 	while (true) {
+		char buf[512] {};
+		size_t bash_read = 0;
+		sys_read(bash_stdout_read_handle, buf, sizeof(buf), &bash_read);
+		if (bash_read) {
+			printf("got bash stdout '%s'\n", buf);
+		}
+
 		auto event = window.wait_for_event();
 		if (event.type == protocol::WindowEvent::CloseRequested) {
 			window.close();

apps/desktop/src/main.cpp

@@ -6,6 +6,7 @@
 #include <ui/context.hpp>
 #include <ui/text.hpp>
 #include <cassert>
+#include <mutex>
 #include <stdio.h>
 #include <string.h>
 
@@ -62,8 +63,8 @@ struct Connection {
 	CrescentHandle event;
 };
 
-// todo mutex
-static NoDestroy<std::vector<std::unique_ptr<Connection>>> CONNECTIONS {};
+static std::vector<std::unique_ptr<Connection>> CONNECTIONS {};
+static std::mutex CONNECTIONS_MUTEX;
 
 struct WindowInfo {
 	ui::Window* window;
@@ -141,9 +142,11 @@ void listener_thread(void* arg) {
 		resp.type = protocol::Response::Connected;
 		resp.connected.event_handle = event_read_handle;
 		// todo check status
-		while (sys_socket_send(connection_socket, &resp, sizeof(resp)) == ERR_TRY_AGAIN);
+		size_t actual;
+		while (sys_socket_send(connection_socket, &resp, sizeof(resp), actual) == ERR_TRY_AGAIN);
 
-		CONNECTIONS->push_back(std::make_unique<Connection>(Connection {
+		std::unique_lock guard {CONNECTIONS_MUTEX};
+		CONNECTIONS.push_back(std::make_unique<Connection>(Connection {
 			.process = peer_addr.target,
 			.control = connection_socket,
 			.event = event_write_handle
@@ -184,6 +187,20 @@ static void destroy_window(Desktop& desktop, ui::Window* window) {
 	}
 }
 
+struct Timer {
+	void start() {
+		sys_get_time(&_start);
+	}
+
+	[[nodiscard]] uint64_t end() const {
+		uint64_t now;
+		sys_get_time(&now);
+		return now - _start;
+	}
+
+	uint64_t _start {};
+};
+
 int main() {
 	while (false) {
 		DevLinkRequest request {
@@ -624,13 +641,15 @@ int main() {
 	uint64_t last_time_update_ns;
 	status = sys_get_time(&last_time_update_ns);
 	assert(status == 0);
+	//uint64_t last_fps = last_time_update_ns;
 
 	while (true) {
 		uint64_t start_time_ns;
 		sys_get_time(&start_time_ns);
 
-		for (size_t i = 0; i < CONNECTIONS->size();) {
-			auto& connection = (*CONNECTIONS)[i];
+		CONNECTIONS_MUTEX.lock();
+		for (size_t i = 0; i < CONNECTIONS.size();) {
+			auto& connection = CONNECTIONS[i];
 
 			protocol::Request req {};
 			size_t received;
@@ -657,7 +676,7 @@ int main() {
 					}
 				}
 
-				CONNECTIONS->erase(CONNECTIONS->begin() + (&connection - CONNECTIONS->data()));
+				CONNECTIONS.erase(CONNECTIONS.begin() + (&connection - CONNECTIONS.data()));
 				continue;
 			}
 
@@ -704,7 +723,8 @@ int main() {
 					});
 
 					// todo check status
-					while (sys_socket_send(connection->control, &resp, sizeof(resp)) == ERR_TRY_AGAIN);
+					size_t actual;
+					while (sys_socket_send(connection->control, &resp, sizeof(resp), actual) == ERR_TRY_AGAIN);
 
 					break;
 				}
@@ -714,7 +734,8 @@ int main() {
 					destroy_window(desktop, window);
 
 					// todo check status
-					while (sys_socket_send(connection->control, &resp, sizeof(resp)) == ERR_TRY_AGAIN);
+					size_t actual;
+					while (sys_socket_send(connection->control, &resp, sizeof(resp), actual) == ERR_TRY_AGAIN);
 
 					break;
 				}
@@ -725,14 +746,16 @@ int main() {
 
 					resp.ack.window_handle = window;
 					// todo check status
-					while (sys_socket_send(connection->control, &resp, sizeof(resp)) == ERR_TRY_AGAIN);
+					size_t actual;
+					while (sys_socket_send(connection->control, &resp, sizeof(resp), actual) == ERR_TRY_AGAIN);
 
 					break;
 				}
 			}
 
 			++i;
 		}
+		CONNECTIONS_MUTEX.unlock();
 
 		while (true) {
 			InputEvent event;
@@ -814,6 +837,12 @@ int main() {
 		uint64_t end_time_ns;
 		sys_get_time(&end_time_ns);
 		auto elapsed = end_time_ns - start_time_ns;
+
+		/*if (end_time_ns - last_fps >= NS_IN_S) {
+			printf("elapsed %lu ns (%f fps)\n", elapsed, static_cast<float>(NS_IN_S) / static_cast<float>(elapsed));
+			last_fps = end_time_ns;
+		}*/
+
 		if (elapsed < NS_IN_S / 144) {
 			auto remaining = NS_IN_S / 144 - elapsed;
 			sys_sleep(remaining);

apps/evm/src/main.cpp

@@ -6,11 +6,128 @@
 
 namespace protocol = windower::protocol;
 
+#include "../../../include/crescent/evm.h"
 #include "vga.hpp"
 #include "vm.hpp"
 
+asm(R"(
+.globl some_code
+.globl some_code_end
+some_code:
+	hlt
+some_code_end:
+)");
+
+extern char some_code[];
+extern char some_code_end[];
+
+#include <cassert>
+#include <cstdio>
+
+#define CR0_PE 1u
+#define CR0_MP (1U << 1)
+#define CR0_EM (1U << 2)
+#define CR0_TS (1U << 3)
+#define CR0_ET (1U << 4)
+#define CR0_NE (1U << 5)
+#define CR0_WP (1U << 16)
+#define CR0_AM (1U << 18)
+#define CR0_NW (1U << 29)
+#define CR0_CD (1U << 30)
+#define CR0_PG (1U << 31)
+
+/* CR4 bits */
+#define CR4_VME 1
+#define CR4_PVI (1U << 1)
+#define CR4_TSD (1U << 2)
+#define CR4_DE (1U << 3)
+#define CR4_PSE (1U << 4)
+#define CR4_PAE (1U << 5)
+#define CR4_MCE (1U << 6)
+#define CR4_PGE (1U << 7)
+#define CR4_PCE (1U << 8)
+#define CR4_OSFXSR (1U << 8)
+#define CR4_OSXMMEXCPT (1U << 10)
+#define CR4_UMIP (1U << 11)
+#define CR4_VMXE (1U << 13)
+#define CR4_SMXE (1U << 14)
+#define CR4_FSGSBASE (1U << 16)
+#define CR4_PCIDE (1U << 17)
+#define CR4_OSXSAVE (1U << 18)
+#define CR4_SMEP (1U << 20)
+#define CR4_SMAP (1U << 21)
+
+#define EFER_SCE 1
+#define EFER_LME (1U << 8)
+#define EFER_LMA (1U << 10)
+#define EFER_NXE (1U << 11)
+
+/* 32-bit page directory entry bits */
+#define PDE32_PRESENT 1
+#define PDE32_RW (1U << 1)
+#define PDE32_USER (1U << 2)
+#define PDE32_PS (1U << 7)
+
+/* 64-bit page * entry bits */
+#define PDE64_PRESENT 1
+#define PDE64_RW (1U << 1)
+#define PDE64_USER (1U << 2)
+#define PDE64_ACCESSED (1U << 5)
+#define PDE64_DIRTY (1U << 6)
+#define PDE64_PS (1U << 7)
+#define PDE64_G (1U << 8)
+
 int main() {
-	windower::Windower windower;
+	CrescentHandle evm;
+	assert(sys_evm_create(evm) == 0);
+	CrescentHandle vcpu;
+	EvmGuestState* regs;
+	assert(sys_evm_create_vcpu(evm, vcpu, &regs) == 0);
+
+	void* mem = nullptr;
+	assert(sys_map(&mem, 0x200000, CRESCENT_PROT_READ | CRESCENT_PROT_WRITE) == 0);
+	assert(sys_evm_map(evm, 0, mem, 0x200000) == 0);
+
+	memcpy(mem, some_code, some_code_end - some_code);
+
+	uint64_t pml4_addr = 0x2000;
+	uint64_t *pml4 = (uint64_t *)((uintptr_t)mem + pml4_addr);
+
+	uint64_t pdpt_addr = 0x3000;
+	uint64_t *pdpt = (uint64_t *)((uintptr_t)mem + pdpt_addr);
+
+	uint64_t pd_addr = 0x4000;
+	uint64_t *pd = (uint64_t *)((uintptr_t)mem + pd_addr);
+
+	pml4[0] = PDE64_PRESENT | PDE64_RW | PDE64_USER | pdpt_addr;
+	pdpt[0] = PDE64_PRESENT | PDE64_RW | PDE64_USER | pd_addr;
+	pd[0] = PDE64_PRESENT | PDE64_RW | PDE64_USER | PDE64_PS;
+
+	regs->cr3 = pml4_addr;
+	regs->cr4 = CR4_PAE;
+	regs->cr0
+		= CR0_PE | CR0_MP | CR0_ET | CR0_NE | CR0_WP | CR0_AM | CR0_PG;
+	regs->efer = EFER_LME | EFER_LMA;
+
+	regs->cs.base = 0;
+	regs->cs.selector = 1 << 3;
+	regs->cs.limit = 0xffffffff;
+
+	regs->ds.base = 0;
+	regs->ds.selector = 2 << 3;
+	regs->es = regs->ds;
+	regs->ss = regs->ds;
+	regs->fs = regs->ds;
+	regs->gs = regs->ds;
+	regs->rflags = 2;
+	regs->rip = 0;
+	regs->rsp = 2 << 20;
+
+	assert(sys_evm_vcpu_write_state(vcpu, EVM_STATE_BITS_SEG_REGS | EVM_STATE_BITS_CONTROL_REGS | EVM_STATE_BITS_EFER) == 0);
+	int res = sys_evm_vcpu_run(vcpu);
+	printf("res: %d\n", res);
+
+	/*windower::Windower windower;
 	if (auto status = windower::Windower::connect(windower); status != 0) {
 		puts("[console]: failed to connect to window manager");
 		return 1;
@@ -50,5 +167,5 @@ int main() {
 
 			window.redraw();
 		}
-	}
+	}*/
 }

apps/init/CMakeLists.txt

@@ -0,0 +1,4 @@
+APP(init
+	src/main.cpp
+)
+target_link_libraries(init PRIVATE common)