From 7dd10a3e53144b134bbc2a35f3fd67978923a0c8 Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Thu, 2 Nov 2023 21:57:29 -0700 Subject: [PATCH] [Zion] Remove dead ZMessage struct. --- zion/object/channel.h | 1 - zion/object/port.h | 1 - zion/syscall/ipc.cpp | 6 ------ zion/usr/zcall.cpp | 2 -- zion/usr/zcall_internal.h | 13 ------------- 5 files changed, 23 deletions(-) delete mode 100644 zion/usr/zcall_internal.h diff --git a/zion/object/channel.h b/zion/object/channel.h index 5a37f89..c458ed6 100644 --- a/zion/object/channel.h +++ b/zion/object/channel.h @@ -8,7 +8,6 @@ #include "lib/message_queue.h" #include "object/ipc_object.h" #include "object/kernel_object.h" -#include "usr/zcall_internal.h" class Channel; diff --git a/zion/object/port.h b/zion/object/port.h index 24513b8..e2628a4 100644 --- a/zion/object/port.h +++ b/zion/object/port.h @@ -8,7 +8,6 @@ #include "object/ipc_object.h" #include "object/kernel_object.h" #include "object/thread.h" -#include "usr/zcall_internal.h" class Port; diff --git a/zion/syscall/ipc.cpp b/zion/syscall/ipc.cpp index f876825..5c40bfc 100644 --- a/zion/syscall/ipc.cpp +++ b/zion/syscall/ipc.cpp @@ -54,12 +54,6 @@ glcr::ErrorCode PortRecv(ZPortRecvReq* req) { RET_ERR(ValidateCapability(port_cap, kZionPerm_Read)); auto port = port_cap->obj(); - ZMessage message{ - .num_bytes = *req->num_bytes, - .data = const_cast(req->data), - .num_caps = *req->num_caps, - .caps = req->caps, - }; return port->Recv(req->num_bytes, req->data, req->num_caps, req->caps); } diff --git a/zion/usr/zcall.cpp b/zion/usr/zcall.cpp index 34d9025..7de0cb0 100644 --- a/zion/usr/zcall.cpp +++ b/zion/usr/zcall.cpp @@ -2,8 +2,6 @@ #include -#include "usr/zcall_internal.h" - z_err_t SysCall1(uint64_t number, const void* first) { z_err_t return_code; asm("syscall" : "=a"(return_code) : "D"(number), "S"(first) : "rcx", "r11"); diff --git a/zion/usr/zcall_internal.h b/zion/usr/zcall_internal.h deleted file mode 100644 index fa25ea5..0000000 --- a/zion/usr/zcall_internal.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include - -#include "include/ztypes.h" - -struct ZMessage { - uint64_t num_bytes; - void* data; - - uint64_t num_caps; - z_cap_t* caps; -};