drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Move ipc calls to take a void*

This commit is contained in:
Drew Galbraith 2023-06-19 18:39:46 -07:00
parent 685070d65e
commit 27f540e9ae
5 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zion/include/zcall.h
View File

@ -37,25 +37,23 @@ void ZThreadExit();
[[nodiscard]] z_err_t ZChannelCreate(z_cap_t* channel1, z_cap_t* channel2);
[[nodiscard]] z_err_t ZChannelSend(z_cap_t chan_cap, uint64_t num_bytes,
const uint8_t* bytes, uint64_t num_caps,
const void* data, uint64_t num_caps,
const z_cap_t* caps);
[[nodiscard]] z_err_t ZChannelRecv(z_cap_t chan_cap, uint64_t num_bytes,
uint8_t* bytes, uint64_t num_caps,
z_cap_t* caps, uint64_t* actual_bytes,
void* data, uint64_t num_caps, z_cap_t* caps,
uint64_t* actual_bytes,
uint64_t* actual_caps);
[[nodiscard]] z_err_t ZPortCreate(z_cap_t* port_cap);
[[nodiscard]] z_err_t ZPortSend(z_cap_t port_cap, uint64_t num_bytes,
const uint8_t* bytes, uint64_t num_caps,
const void* data, uint64_t num_caps,
z_cap_t* caps);
[[nodiscard]] z_err_t ZPortRecv(z_cap_t port_cap, uint64_t num_bytes,
uint8_t* bytes, uint64_t num_caps,
z_cap_t* caps, uint64_t* actual_bytes,
uint64_t* actual_caps);
void* data, uint64_t num_caps, z_cap_t* caps,
uint64_t* actual_bytes, uint64_t* actual_caps);
[[nodiscard]] z_err_t ZPortPoll(z_cap_t port_cap, uint64_t num_bytes,
uint8_t* bytes, uint64_t num_caps,
z_cap_t* caps, uint64_t* actual_bytes,
uint64_t* actual_caps);
void* data, uint64_t num_caps, z_cap_t* caps,
uint64_t* actual_bytes, uint64_t* actual_caps);
[[nodiscard]] z_err_t ZIrqRegister(uint64_t irq_num, z_cap_t* port_cap);
[[nodiscard]] z_err_t ZCapDuplicate(z_cap_t cap_in, z_cap_t* cap_out);

4
zion/object/channel.cpp
View File

@ -37,7 +37,7 @@ z_err_t Channel::Read(ZMessage& msg) {
msg.num_bytes = next_msg->num_bytes;
for (uint64_t i = 0; i < msg.num_bytes; i++) {
msg.bytes[i] = next_msg->bytes[i];
static_cast<uint8_t*>(msg.data)[i] = next_msg->bytes[i];
}
msg.num_caps = next_msg->caps.size();
@ -63,7 +63,7 @@ z_err_t Channel::EnqueueMessage(const ZMessage& msg) {
message->num_bytes = msg.num_bytes;
message->bytes = new uint8_t[msg.num_bytes];
for (uint64_t i = 0; i < msg.num_bytes; i++) {
message->bytes[i] = msg.bytes[i];
message->bytes[i] = static_cast<uint8_t*>(msg.data)[i];
}
// Release and store capabilities.

4
zion/object/port.cpp
View File

@ -14,7 +14,7 @@ z_err_t Port::Write(const ZMessage& msg) {
message->num_bytes = msg.num_bytes;
message->bytes = new uint8_t[msg.num_bytes];
for (uint64_t i = 0; i < msg.num_bytes; i++) {
message->bytes[i] = msg.bytes[i];
message->bytes[i] = static_cast<uint8_t*>(msg.data)[i];
}
for (uint64_t i = 0; i < msg.num_caps; i++) {
@ -57,7 +57,7 @@ z_err_t Port::Read(ZMessage& msg) {
msg.num_bytes = next_msg->num_bytes;
for (uint64_t i = 0; i < msg.num_bytes; i++) {
msg.bytes[i] = next_msg->bytes[i];
static_cast<uint8_t*>(msg.data)[i] = next_msg->bytes[i];
}
msg.num_caps = next_msg->caps.size();

20
zion/usr/zcall.cpp
View File

@ -125,14 +125,14 @@ z_err_t ZChannelCreate(z_cap_t* channel1, z_cap_t* channel2) {
return ret;
}
z_err_t ZChannelSend(z_cap_t chan_cap, uint64_t num_bytes, const uint8_t* bytes,
z_err_t ZChannelSend(z_cap_t chan_cap, uint64_t num_bytes, const void* data,
uint64_t num_caps, const z_cap_t* caps) {
ZChannelSendReq req{
.chan_cap = chan_cap,
.message =
{
.num_bytes = num_bytes,
.bytes = const_cast<uint8_t*>(bytes),
.data = const_cast<void*>(data),
.num_caps = num_caps,
.caps = const_cast<z_cap_t*>(caps),
},
@ -140,7 +140,7 @@ z_err_t ZChannelSend(z_cap_t chan_cap, uint64_t num_bytes, const uint8_t* bytes,
return SysCall1(Z_CHANNEL_SEND, &req);
}
z_err_t ZChannelRecv(z_cap_t chan_cap, uint64_t num_bytes, uint8_t* bytes,
z_err_t ZChannelRecv(z_cap_t chan_cap, uint64_t num_bytes, void* data,
uint64_t num_caps, z_cap_t* caps, uint64_t* actual_bytes,
uint64_t* actual_caps) {
ZChannelRecvReq req{
@ -148,7 +148,7 @@ z_err_t ZChannelRecv(z_cap_t chan_cap, uint64_t num_bytes, uint8_t* bytes,
.message =
{
.num_bytes = num_bytes,
.bytes = bytes,
.data = data,
.num_caps = num_caps,
.caps = caps,
},
@ -166,19 +166,19 @@ z_err_t ZPortCreate(z_cap_t* port_cap) {
return ret;
}
z_err_t ZPortSend(z_cap_t port_cap, uint64_t num_bytes, const uint8_t* bytes,
z_err_t ZPortSend(z_cap_t port_cap, uint64_t num_bytes, const void* data,
uint64_t num_caps, z_cap_t* caps) {
ZPortSendReq req{.port_cap = port_cap,
.message = {
.num_bytes = num_bytes,
.bytes = const_cast<uint8_t*>(bytes),
.data = const_cast<void*>(data),
.num_caps = num_caps,
.caps = caps,
}};
return SysCall1(Z_PORT_SEND, &req);
}
z_err_t ZPortRecv(z_cap_t port_cap, uint64_t num_bytes, uint8_t* bytes,
z_err_t ZPortRecv(z_cap_t port_cap, uint64_t num_bytes, void* data,
uint64_t num_caps, z_cap_t* caps, uint64_t* actual_bytes,
uint64_t* actual_caps) {
ZPortRecvReq req{
@ -186,7 +186,7 @@ z_err_t ZPortRecv(z_cap_t port_cap, uint64_t num_bytes, uint8_t* bytes,
.message =
{
.num_bytes = num_bytes,
.bytes = bytes,
.data = data,
.num_caps = num_caps,
.caps = caps,
},
@ -197,7 +197,7 @@ z_err_t ZPortRecv(z_cap_t port_cap, uint64_t num_bytes, uint8_t* bytes,
return ret;
}
z_err_t ZPortPoll(z_cap_t port_cap, uint64_t num_bytes, uint8_t* bytes,
z_err_t ZPortPoll(z_cap_t port_cap, uint64_t num_bytes, void* data,
uint64_t num_caps, z_cap_t* caps, uint64_t* actual_bytes,
uint64_t* actual_caps) {
ZPortRecvReq req{
@ -205,7 +205,7 @@ z_err_t ZPortPoll(z_cap_t port_cap, uint64_t num_bytes, uint8_t* bytes,
.message =
{
.num_bytes = num_bytes,
.bytes = bytes,
.data = data,
.num_caps = num_caps,
.caps = caps,
},

2
zion/usr/zcall_internal.h
View File

@ -70,7 +70,7 @@ struct ZChannelCreateResp {
struct ZMessage {
uint64_t num_bytes;
uint8_t* bytes;
void* data;
uint64_t num_caps;
z_cap_t* caps;