Skip to content

Commit

Permalink
Kernel+LibC: Add a DebugLogDevice that forwards everything to I/O por…
Browse files Browse the repository at this point in the history
…t 0xe9.

This is then used to implement the userspace dbgprintf() in a far more
efficient way than what we had before. :^)
  • Loading branch information
awesomekling committed Apr 18, 2019
1 parent 3b986da commit 3817f5f
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 7 deletions.
28 changes: 28 additions & 0 deletions Kernel/Devices/DebugLogDevice.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#include <Kernel/Devices/DebugLogDevice.h>
#include <Kernel/IO.h>

static DebugLogDevice* s_the;

DebugLogDevice& DebugLogDevice::the()
{
ASSERT(s_the);
return *s_the;
}

DebugLogDevice::DebugLogDevice()
: CharacterDevice(1, 18)
{
s_the = this;
}

DebugLogDevice::~DebugLogDevice()
{
}

ssize_t DebugLogDevice::write(Process&, const byte* data, ssize_t data_size)
{
for (int i = 0; i < data_size; ++i)
IO::out8(0xe9, data[i]);
return data_size;
}

17 changes: 17 additions & 0 deletions Kernel/Devices/DebugLogDevice.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include <Kernel/Devices/CharacterDevice.h>

class DebugLogDevice final : public CharacterDevice {
public:
DebugLogDevice();
virtual ~DebugLogDevice() override;

static DebugLogDevice& the();

private:
// ^CharacterDevice
virtual ssize_t read(Process&, byte*, ssize_t) override { return 0; }
virtual ssize_t write(Process&, const byte*, ssize_t) override;
virtual bool can_write(Process&) const override { return true; }
virtual bool can_read(Process&) const override { return true; }
virtual const char* class_name() const override { return "DebugLogDevice"; }
};
1 change: 1 addition & 0 deletions Kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ VFS_OBJS = \
Devices/FullDevice.o \
Devices/ZeroDevice.o \
Devices/RandomDevice.o \
Devices/DebugLogDevice.o \
FileSystem/FileSystem.o \
FileSystem/DiskBackedFileSystem.o \
FileSystem/Ext2FileSystem.o \
Expand Down
3 changes: 3 additions & 0 deletions Kernel/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <Kernel/Devices/BXVGADevice.h>
#include <Kernel/Net/E1000NetworkAdapter.h>
#include <Kernel/Net/NetworkTask.h>
#include <Kernel/Devices/DebugLogDevice.h>

#define SPAWN_TERMINAL
//#define SPAWN_LAUNCHER
Expand All @@ -42,6 +43,7 @@ VirtualConsole* tty2;
VirtualConsole* tty3;
KeyboardDevice* keyboard;
PS2MouseDevice* ps2mouse;
DebugLogDevice* dev_debuglog;
NullDevice* dev_null;
VFS* vfs;

Expand Down Expand Up @@ -151,6 +153,7 @@ extern "C" [[noreturn]] void init()
init_ksyms();

vfs = new VFS;
dev_debuglog = new DebugLogDevice;

auto console = make<Console>();

Expand Down
1 change: 1 addition & 0 deletions Kernel/sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ mknod mnt/dev/random c 1 8
mknod mnt/dev/null c 1 3
mknod mnt/dev/zero c 1 5
mknod mnt/dev/full c 1 7
mknod -m 666 mnt/dev/debuglog c 1 18
mknod mnt/dev/keyboard c 85 1
mknod mnt/dev/psaux c 10 1
mknod -m 666 mnt/dev/ptmx c 5 2
Expand Down
17 changes: 10 additions & 7 deletions LibC/stdio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@

extern "C" {

static FILE __default_streams[3];
static FILE __default_streams[4];
FILE* stdin;
FILE* stdout;
FILE* stderr;
FILE* stddbg;

void init_FILE(FILE& fp, int fd, int mode)
{
Expand All @@ -39,9 +40,16 @@ void __stdio_init()
stdin = &__default_streams[0];
stdout = &__default_streams[1];
stderr = &__default_streams[2];
stddbg = &__default_streams[3];
init_FILE(*stdin, 0, isatty(0) ? _IOLBF : _IOFBF);
init_FILE(*stdout, 1, isatty(1) ? _IOLBF : _IOFBF);
init_FILE(*stderr, 2, _IONBF);
int fd = open("/dev/debuglog", O_WRONLY);
if (fd < 0) {
perror("open /dev/debuglog");
ASSERT_NOT_REACHED();
}
init_FILE(*stddbg, fd, _IOLBF);
}

int setvbuf(FILE* stream, char* buf, int mode, size_t size)
Expand Down Expand Up @@ -263,16 +271,11 @@ void rewind(FILE* stream)
fseek(stream, 0, SEEK_SET);
}

static void sys_putch(char*&, char ch)
{
syscall(SC_putch, ch);
}

int dbgprintf(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
int ret = printf_internal(sys_putch, nullptr, fmt, ap);
int ret = vfprintf(stddbg, fmt, ap);
va_end(ap);
return ret;
}
Expand Down
1 change: 1 addition & 0 deletions LibC/stdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ typedef struct __STDIO_FILE FILE;
extern FILE* stdin;
extern FILE* stdout;
extern FILE* stderr;
extern FILE* stddbg;

typedef size_t fpos_t;

Expand Down

0 comments on commit 3817f5f

Please sign in to comment.