RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-06 15:05:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[orbis-kernel] do not use linker for exec

Browse source 
implement hdd device stub
implement /dev/console rw
remove dup2 hack
fix altstack after execve
This commit is contained in:
DH 2023-11-02 16:26:58 +03:00
parent 3464f50eb9
commit 3cb4baed51
11 changed files with 289 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

72
rpcsx-os/iodev/console.cpp
View file

@ -1,32 +1,78 @@
#include "io-device.hpp"
#include "orbis/KernelAllocator.hpp"
#include "orbis/error/ErrorCode.hpp"
#include "orbis/file.hpp"
#include "orbis/uio.hpp"
#include "orbis/utils/Logs.hpp"
#include <span>
#include <unistd.h>
struct ConsoleFile : orbis::File {};
struct ConsoleDevice : IoDevice {
int inputFd;
int outputFd;
ConsoleDevice(int inputFd, int outputFd)
: inputFd(inputFd), outputFd(outputFd) {}
orbis::ErrorCode open(orbis::Ref<orbis::File> *file, const char *path,
std::uint32_t flags, std::uint32_t mode,
orbis::Thread *thread) override;
};
static orbis::ErrorCode console_ioctl(orbis::File *file, std::uint64_t request,
void *argp, orbis::Thread *thread) {
void *argp, orbis::Thread *thread) {
ORBIS_LOG_FATAL("Unhandled console ioctl", request);
return {};
}
static orbis::ErrorCode console_read(orbis::File *file, orbis::Uio *uio,
orbis::Thread *thread) {
auto dev = dynamic_cast<ConsoleDevice *>(file->device.get());
for (auto vec : std::span(uio->iov, uio->iovcnt)) {
auto result = ::read(dev->inputFd, vec.base, vec.len);
if (result < 0) {
return orbis::ErrorCode::IO;
}
uio->offset += result;
break;
}
return {};
}
static orbis::ErrorCode console_write(orbis::File *file, orbis::Uio *uio,
orbis::Thread *thread) {
auto dev = dynamic_cast<ConsoleDevice *>(file->device.get());
for (auto vec : std::span(uio->iov, uio->iovcnt)) {
::write(dev->outputFd, vec.base, vec.len);
}
uio->resid = 0;
return {};
}
static const orbis::FileOps fileOps = {
.ioctl = console_ioctl,
.read = console_read,
.write = console_write,
};
struct ConsoleDevice : IoDevice {
orbis::ErrorCode open(orbis::Ref<orbis::File> *file, const char *path,
std::uint32_t flags, std::uint32_t mode,
orbis::Thread *thread) override {
auto newFile = orbis::knew<ConsoleFile>();
newFile->ops = &fileOps;
newFile->device = this;
orbis::ErrorCode ConsoleDevice::open(orbis::Ref<orbis::File> *file,
const char *path, std::uint32_t flags,
std::uint32_t mode,
orbis::Thread *thread) {
auto newFile = orbis::knew<ConsoleFile>();
newFile->ops = &fileOps;
newFile->device = this;
*file = newFile;
return {};
}
};
*file = newFile;
return {};
}
IoDevice *createConsoleCharacterDevice() { return orbis::knew<ConsoleDevice>(); }
IoDevice *createConsoleCharacterDevice(int inputFd, int outputFd) {
return orbis::knew<ConsoleDevice>(inputFd, outputFd);
}