From 32407e728971006ed3d0885e01c22fb66c8adc57 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 15 Jul 2016 23:12:14 +0200 Subject: Move stuff around, again --- src/lib/bam.lua | 6 +- src/lib/include/draw.h | 64 ------------ src/lib/include/gip.h | 56 ----------- src/lib/include/keyboard.h | 39 -------- src/lib/include/kogata/draw.h | 64 ++++++++++++ src/lib/include/kogata/gip.h | 56 +++++++++++ src/lib/include/kogata/keyboard.h | 39 ++++++++ src/lib/include/kogata/mainloop.h | 47 +++++++++ src/lib/include/kogata/syscall.h | 63 ++++++++++++ src/lib/include/mainloop.h | 47 --------- src/lib/include/proto/gip.h | 2 +- src/lib/include/stdio.h | 2 +- src/lib/include/stdlib.h | 2 +- src/lib/include/syscall.h | 63 ------------ src/lib/libc/debug.c | 18 ++++ src/lib/libc/malloc.c | 70 +++++++++++++ src/lib/libc/start.c | 17 ++++ src/lib/libc/stdio.c | 63 ++++++++++++ src/lib/libc/syscall.c | 204 ++++++++++++++++++++++++++++++++++++++ src/lib/libc/unistd.c | 66 ++++++++++++ src/lib/libkogata/debug.c | 19 ---- src/lib/libkogata/draw.c | 10 +- src/lib/libkogata/gip.c | 4 +- src/lib/libkogata/keyboard.c | 11 +- src/lib/libkogata/mainloop.c | 4 +- src/lib/libkogata/malloc.c | 70 ------------- src/lib/libkogata/start.c | 17 ---- src/lib/libkogata/stdio.c | 63 ------------ src/lib/libkogata/syscall.c | 203 ------------------------------------- src/lib/libkogata/unistd.c | 67 ------------- 30 files changed, 729 insertions(+), 727 deletions(-) delete mode 100644 src/lib/include/draw.h delete mode 100644 src/lib/include/gip.h delete mode 100644 src/lib/include/keyboard.h create mode 100644 src/lib/include/kogata/draw.h create mode 100644 src/lib/include/kogata/gip.h create mode 100644 src/lib/include/kogata/keyboard.h create mode 100644 src/lib/include/kogata/mainloop.h create mode 100644 src/lib/include/kogata/syscall.h delete mode 100644 src/lib/include/mainloop.h delete mode 100644 src/lib/include/syscall.h create mode 100644 src/lib/libc/debug.c create mode 100644 src/lib/libc/malloc.c create mode 100644 src/lib/libc/start.c create mode 100644 src/lib/libc/stdio.c create mode 100644 src/lib/libc/syscall.c create mode 100644 src/lib/libc/unistd.c delete mode 100644 src/lib/libkogata/debug.c delete mode 100644 src/lib/libkogata/malloc.c delete mode 100644 src/lib/libkogata/start.c delete mode 100644 src/lib/libkogata/stdio.c delete mode 100644 src/lib/libkogata/syscall.c delete mode 100644 src/lib/libkogata/unistd.c (limited to 'src/lib') diff --git a/src/lib/bam.lua b/src/lib/bam.lua index b8e51e4..cef678e 100644 --- a/src/lib/bam.lua +++ b/src/lib/bam.lua @@ -3,6 +3,8 @@ local function lib(name) return Compile(user_settings, source) end -libkogata = {lib('libkogata'), common_libc, common_libalgo, common_libkogata} +libc = {lib('libc'), common_libc, common_libkogata} -liblua = lib('lua') +libkogata = {lib('libkogata'), libc} + +liblua = {lib('lua'), libc} diff --git a/src/lib/include/draw.h b/src/lib/include/draw.h deleted file mode 100644 index 5296b92..0000000 --- a/src/lib/include/draw.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include -#include - -// ---- Generic drawing functions - -// ---- Data structures - -typedef struct { - fb_info_t geom; - - fd_t fd; - uint8_t* data; -} fb_t; - -typedef struct font font_t; - -typedef uint32_t color_t; // a color is always linked to a FB on which it is to be applied - -// ---- Buffer creation - -fb_t *g_fb_from_file(fd_t file, fb_info_t *geom); -fb_t *g_fb_from_mem(uint8_t* region, fb_info_t *geom); - -void g_delete_fb(fb_t *fb); - -// ---- Color manipulation - -color_t g_color_rgb(fb_t *f, uint8_t r, uint8_t g, uint8_t b); - -// ---- Drawing primitives - -void g_plot(fb_t *fb, int x, int y, color_t c); - -void g_hline(fb_t *fb, int x, int y, int w, color_t c); // horizontal line -void g_vline(fb_t *fb, int x, int y, int h, color_t c); // vertical line -void g_line(fb_t *fb, int x1, int y1, int x2, int y2, color_t c); - -void g_rect(fb_t *fb, int x, int y, int w, int h, color_t c); -void g_fillrect(fb_t *fb, int x, int y, int w, int h, color_t c); -void g_rect_r(fb_t *fb, fb_region_t reg, color_t c); -void g_fillrect_r(fb_t *fb, fb_region_t reg, color_t c); - -void g_circle(fb_t *fb, int cx, int cy, int r, color_t c); -void g_fillcircle(fb_t *fb, int cx, int cy, int r, color_t c); - -void g_blit(fb_t *dst, int x, int y, fb_t *src); -void g_blit_region(fb_t *dst, int x, int y, fb_t *src, fb_region_t reg); - -void g_scroll_up(fb_t *fb, int l); - -// ---- Text manipulation - -font_t *g_load_font(const char* fontname); -void g_free_font(font_t *f); - -int g_text_width(font_t *f, const char* text); -int g_text_height(font_t *f, const char* text); - -void g_write(fb_t *fb, int x, int y, const char* text, font_t *font, color_t c); - - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/gip.h b/src/lib/include/gip.h deleted file mode 100644 index 9c66091..0000000 --- a/src/lib/include/gip.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once - -// Not thread safe - -#include - -#include -#include - -typedef struct gip_handler gip_handler_t; - -typedef void (*noarg_gip_callback_t)(gip_handler_t *s, gip_msg_header *m); -typedef void (*gip_reply_callback_t)(gip_handler_t *s, gip_msg_header *m, void* msg_data, void* cb_data); - -typedef struct { - noarg_gip_callback_t - reset, initiate, ok, failure, - enable_features, disable_features, - query_mode, set_mode, switch_buffer, - key_down, key_up; - void (*buffer_info)(gip_handler_t *s, gip_msg_header *m, gip_buffer_info_msg *i); - void (*mode_info)(gip_handler_t *s, gip_msg_header *m, gip_mode_info_msg *i); - void (*buffer_damage)(gip_handler_t *s, gip_msg_header *m, gip_buffer_damage_msg *i); - void (*unknown_msg)(gip_handler_t *s, gip_msg_header *m); - void (*fd_error)(gip_handler_t *s); -} gip_handler_callbacks_t; - -typedef struct gip_handler { - gip_handler_callbacks_t* cb; - void* data; - - gip_msg_header msg_buf; - gip_buffer_info_msg buffer_info_msg_buf; - gip_mode_info_msg mode_info_msg_buf; - gip_buffer_damage_msg buffer_damage_msg_buf; - - hashtbl_t *requests_in_progress; - uint32_t next_req_id; - - mainloop_fd_t mainloop_item; -} gip_handler_t; - -gip_handler_t *new_gip_handler(gip_handler_callbacks_t *cb, void* data); -void delete_gip_handler(gip_handler_t *h); - -// GIP send messages - -bool gip_cmd(gip_handler_t *h, gip_msg_header *msg, void* msg_data, gip_reply_callback_t cb, void* cb_data); - -bool gip_reply(gip_handler_t *h, gip_msg_header *orig_request, gip_msg_header *msg, void* msg_data); -bool gip_reply_fail(gip_handler_t *h, gip_msg_header *o); -bool gip_reply_ok(gip_handler_t *h, gip_msg_header *o); - -bool gip_notify(gip_handler_t *h, gip_msg_header *msg, void* msg_data); - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/keyboard.h b/src/lib/include/keyboard.h deleted file mode 100644 index 63c6c2c..0000000 --- a/src/lib/include/keyboard.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once - -#include - -#include - -#define KBD_CHAR 0x01 -#define KBD_ALT 0x02 -#define KBD_CTRL 0x04 -#define KBD_SUPER 0x08 -#define KBD_SHIFT 0x10 -#define KBD_CAPS 0x20 -#define KBD_MOD 0x40 - -typedef struct { - union { - int chr; // if flags & KBD_CHAR, chr is a character number - int key; // if !(flags & KBD_CHAR), key is one of KBD_CODE_* defined in - }; - uint32_t flags; // one of kbd_* -} key_t; - -typedef struct { - keymap_t km; - int key_char[256]; - uint32_t status; // mask of alt/ctrl/super -} keyboard_t; - -keyboard_t *init_keyboard(); -void free_keyboard(keyboard_t *t); - -bool load_keymap(keyboard_t *kb, const char* kmname); - -key_t keyboard_press(keyboard_t *t, int scancode); // what key is pressed? -key_t keyboard_release(keyboard_t *t, int scancode); // what key is released? - - - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/kogata/draw.h b/src/lib/include/kogata/draw.h new file mode 100644 index 0000000..fb9fe05 --- /dev/null +++ b/src/lib/include/kogata/draw.h @@ -0,0 +1,64 @@ +#pragma once + +#include +#include + +// ---- Generic drawing functions + +// ---- Data structures + +typedef struct { + fb_info_t geom; + + fd_t fd; + uint8_t* data; +} fb_t; + +typedef struct font font_t; + +typedef uint32_t color_t; // a color is always linked to a FB on which it is to be applied + +// ---- Buffer creation + +fb_t *g_fb_from_file(fd_t file, fb_info_t *geom); +fb_t *g_fb_from_mem(uint8_t* region, fb_info_t *geom); + +void g_delete_fb(fb_t *fb); + +// ---- Color manipulation + +color_t g_color_rgb(fb_t *f, uint8_t r, uint8_t g, uint8_t b); + +// ---- Drawing primitives + +void g_plot(fb_t *fb, int x, int y, color_t c); + +void g_hline(fb_t *fb, int x, int y, int w, color_t c); // horizontal line +void g_vline(fb_t *fb, int x, int y, int h, color_t c); // vertical line +void g_line(fb_t *fb, int x1, int y1, int x2, int y2, color_t c); + +void g_rect(fb_t *fb, int x, int y, int w, int h, color_t c); +void g_fillrect(fb_t *fb, int x, int y, int w, int h, color_t c); +void g_rect_r(fb_t *fb, fb_region_t reg, color_t c); +void g_fillrect_r(fb_t *fb, fb_region_t reg, color_t c); + +void g_circle(fb_t *fb, int cx, int cy, int r, color_t c); +void g_fillcircle(fb_t *fb, int cx, int cy, int r, color_t c); + +void g_blit(fb_t *dst, int x, int y, fb_t *src); +void g_blit_region(fb_t *dst, int x, int y, fb_t *src, fb_region_t reg); + +void g_scroll_up(fb_t *fb, int l); + +// ---- Text manipulation + +font_t *g_load_font(const char* fontname); +void g_free_font(font_t *f); + +int g_text_width(font_t *f, const char* text); +int g_text_height(font_t *f, const char* text); + +void g_write(fb_t *fb, int x, int y, const char* text, font_t *font, color_t c); + + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/kogata/gip.h b/src/lib/include/kogata/gip.h new file mode 100644 index 0000000..1d1725a --- /dev/null +++ b/src/lib/include/kogata/gip.h @@ -0,0 +1,56 @@ +#pragma once + +// Not thread safe + +#include +#include + +#include + +typedef struct gip_handler gip_handler_t; + +typedef void (*noarg_gip_callback_t)(gip_handler_t *s, gip_msg_header *m); +typedef void (*gip_reply_callback_t)(gip_handler_t *s, gip_msg_header *m, void* msg_data, void* cb_data); + +typedef struct { + noarg_gip_callback_t + reset, initiate, ok, failure, + enable_features, disable_features, + query_mode, set_mode, switch_buffer, + key_down, key_up; + void (*buffer_info)(gip_handler_t *s, gip_msg_header *m, gip_buffer_info_msg *i); + void (*mode_info)(gip_handler_t *s, gip_msg_header *m, gip_mode_info_msg *i); + void (*buffer_damage)(gip_handler_t *s, gip_msg_header *m, gip_buffer_damage_msg *i); + void (*unknown_msg)(gip_handler_t *s, gip_msg_header *m); + void (*fd_error)(gip_handler_t *s); +} gip_handler_callbacks_t; + +typedef struct gip_handler { + gip_handler_callbacks_t* cb; + void* data; + + gip_msg_header msg_buf; + gip_buffer_info_msg buffer_info_msg_buf; + gip_mode_info_msg mode_info_msg_buf; + gip_buffer_damage_msg buffer_damage_msg_buf; + + hashtbl_t *requests_in_progress; + uint32_t next_req_id; + + mainloop_fd_t mainloop_item; +} gip_handler_t; + +gip_handler_t *new_gip_handler(gip_handler_callbacks_t *cb, void* data); +void delete_gip_handler(gip_handler_t *h); + +// GIP send messages + +bool gip_cmd(gip_handler_t *h, gip_msg_header *msg, void* msg_data, gip_reply_callback_t cb, void* cb_data); + +bool gip_reply(gip_handler_t *h, gip_msg_header *orig_request, gip_msg_header *msg, void* msg_data); +bool gip_reply_fail(gip_handler_t *h, gip_msg_header *o); +bool gip_reply_ok(gip_handler_t *h, gip_msg_header *o); + +bool gip_notify(gip_handler_t *h, gip_msg_header *msg, void* msg_data); + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/kogata/keyboard.h b/src/lib/include/kogata/keyboard.h new file mode 100644 index 0000000..63c6c2c --- /dev/null +++ b/src/lib/include/kogata/keyboard.h @@ -0,0 +1,39 @@ +#pragma once + +#include + +#include + +#define KBD_CHAR 0x01 +#define KBD_ALT 0x02 +#define KBD_CTRL 0x04 +#define KBD_SUPER 0x08 +#define KBD_SHIFT 0x10 +#define KBD_CAPS 0x20 +#define KBD_MOD 0x40 + +typedef struct { + union { + int chr; // if flags & KBD_CHAR, chr is a character number + int key; // if !(flags & KBD_CHAR), key is one of KBD_CODE_* defined in + }; + uint32_t flags; // one of kbd_* +} key_t; + +typedef struct { + keymap_t km; + int key_char[256]; + uint32_t status; // mask of alt/ctrl/super +} keyboard_t; + +keyboard_t *init_keyboard(); +void free_keyboard(keyboard_t *t); + +bool load_keymap(keyboard_t *kb, const char* kmname); + +key_t keyboard_press(keyboard_t *t, int scancode); // what key is pressed? +key_t keyboard_release(keyboard_t *t, int scancode); // what key is released? + + + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/kogata/mainloop.h b/src/lib/include/kogata/mainloop.h new file mode 100644 index 0000000..2b447ef --- /dev/null +++ b/src/lib/include/kogata/mainloop.h @@ -0,0 +1,47 @@ +#pragma once + +// These functions are not thread safe, their purpose +// is to multiplex several IO operations on a +// single thread. + +#include + +#define MAINLOOP_MAX_WR_BUFS 4 + +typedef struct mainloop_fd mainloop_fd_t; + +typedef void (*buf_full_callback_t)(mainloop_fd_t *fd); +typedef void (*fd_error_callback_t)(mainloop_fd_t *fd); + +typedef struct { + size_t size, written; + void* buf; + bool must_free; +} mainloop_wr_buf_t; + +typedef struct mainloop_fd { + fd_t fd; + + size_t rd_buf_expect_size, rd_buf_filled; + void* rd_buf; + + mainloop_wr_buf_t wr_bufs[MAINLOOP_MAX_WR_BUFS]; + + void* data; + + buf_full_callback_t rd_on_full; + fd_error_callback_t on_error; + + mainloop_fd_t *next; +} mainloop_fd_t; + +void mainloop_add_fd(mainloop_fd_t* fd); +void mainloop_rm_fd(mainloop_fd_t* fd); + +void mainloop_expect(mainloop_fd_t *fd, void* buf, size_t size, buf_full_callback_t cb); +bool mainloop_nonblocking_write(mainloop_fd_t *fd, void* buf, size_t size, bool must_free_buf); + +void mainloop_run(); +void mainloop_exit(); + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/kogata/syscall.h b/src/lib/include/kogata/syscall.h new file mode 100644 index 0000000..378dda2 --- /dev/null +++ b/src/lib/include/kogata/syscall.h @@ -0,0 +1,63 @@ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include + +#include + +typedef void (*entry_t)(void*); + +void dbg_print(const char* str); +void yield(); +void exit(int code); +void usleep(int usecs); +bool sys_new_thread(void* eip, void* esp); +void exit_thread(); + +bool mmap(void* addr, size_t size, int mode); +bool mmap_file(fd_t file, size_t offset, void* addr, size_t size, int mode); +bool mchmap(void* addr, int mode); +bool munmap(void* addr); + +bool create(const char* name, int type); +bool delete(const char* name); +bool move(const char* oldname, const char* newname); +bool stat(const char* name, stat_t *s); + +fd_t open(const char* name, int mode); +void close(fd_t file); +size_t read(fd_t file, size_t offset, size_t len, char *buf); +size_t write(fd_t file, size_t offset, size_t len, const char* buf); +bool readdir(fd_t file, size_t ent_no, dirent_t *d); +bool stat_open(fd_t file, stat_t *s); +int ioctl(fd_t file, int command, void* data); +int fctl(fd_t file, int command, void* data); +bool select(sel_fd_t* fds, size_t nfds, int timeout); + +fd_pair_t make_channel(bool blocking); +fd_t make_shm(size_t size); +bool gen_token(fd_t file, token_t *tok); +fd_t use_token(token_t *tok); + +bool make_fs(const char* name, const char* driver, fd_t source, const char* options); +bool fs_add_source(const char* fs, fd_t source, const char* options); +bool fs_subfs(const char* name, const char* orig_fs, const char* root, int ok_modes); +void fs_remove(const char* name); + +pid_t new_proc(); +bool bind_fs(pid_t pid, const char* new_name, const char* fs); +bool bind_subfs(pid_t pid, const char* new_name, const char* fs, const char* root, int ok_modes); +bool bind_make_fs(pid_t pid, const char* name, const char* driver, fd_t source, const char* options); +bool bind_fd(pid_t pid, fd_t new_fd, fd_t fd); +bool proc_exec(pid_t pid, const char* file); +bool proc_status(pid_t pid, proc_status_t *s); +bool proc_kill(pid_t pid, proc_status_t *s); +void proc_wait(pid_t pid, bool wait, proc_status_t *s); + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/mainloop.h b/src/lib/include/mainloop.h deleted file mode 100644 index 1e71ffb..0000000 --- a/src/lib/include/mainloop.h +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once - -// These functions are not thread safe, their purpose -// is to multiplex several IO operations on a -// single thread. - -#include - -#define MAINLOOP_MAX_WR_BUFS 4 - -typedef struct mainloop_fd mainloop_fd_t; - -typedef void (*buf_full_callback_t)(mainloop_fd_t *fd); -typedef void (*fd_error_callback_t)(mainloop_fd_t *fd); - -typedef struct { - size_t size, written; - void* buf; - bool must_free; -} mainloop_wr_buf_t; - -typedef struct mainloop_fd { - fd_t fd; - - size_t rd_buf_expect_size, rd_buf_filled; - void* rd_buf; - - mainloop_wr_buf_t wr_bufs[MAINLOOP_MAX_WR_BUFS]; - - void* data; - - buf_full_callback_t rd_on_full; - fd_error_callback_t on_error; - - mainloop_fd_t *next; -} mainloop_fd_t; - -void mainloop_add_fd(mainloop_fd_t* fd); -void mainloop_rm_fd(mainloop_fd_t* fd); - -void mainloop_expect(mainloop_fd_t *fd, void* buf, size_t size, buf_full_callback_t cb); -bool mainloop_nonblocking_write(mainloop_fd_t *fd, void* buf, size_t size, bool must_free_buf); - -void mainloop_run(); -void mainloop_exit(); - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/include/proto/gip.h b/src/lib/include/proto/gip.h index ca8b868..5cf0166 100644 --- a/src/lib/include/proto/gip.h +++ b/src/lib/include/proto/gip.h @@ -2,7 +2,7 @@ #include -#include +#include /* Definition of the GIP protocol (Graphics Initiation Protocol). diff --git a/src/lib/include/stdio.h b/src/lib/include/stdio.h index f46add4..1e75270 100644 --- a/src/lib/include/stdio.h +++ b/src/lib/include/stdio.h @@ -2,7 +2,7 @@ #include -#include +#include extern fd_t stdio; diff --git a/src/lib/include/stdlib.h b/src/lib/include/stdlib.h index 29d8661..30da9a6 100644 --- a/src/lib/include/stdlib.h +++ b/src/lib/include/stdlib.h @@ -1,6 +1,6 @@ #pragma once -#include "malloc.h" +#include #define EXIT_SUCCESS 0 #define EXIT_FAILURE 255 diff --git a/src/lib/include/syscall.h b/src/lib/include/syscall.h deleted file mode 100644 index 07defdb..0000000 --- a/src/lib/include/syscall.h +++ /dev/null @@ -1,63 +0,0 @@ -#pragma once - -#include -#include -#include - -#include -#include -#include -#include - -#include - -typedef void (*entry_t)(void*); - -void dbg_print(const char* str); -void yield(); -void exit(int code); -void usleep(int usecs); -bool sys_new_thread(void* eip, void* esp); -void exit_thread(); - -bool mmap(void* addr, size_t size, int mode); -bool mmap_file(fd_t file, size_t offset, void* addr, size_t size, int mode); -bool mchmap(void* addr, int mode); -bool munmap(void* addr); - -bool create(const char* name, int type); -bool delete(const char* name); -bool move(const char* oldname, const char* newname); -bool stat(const char* name, stat_t *s); - -fd_t open(const char* name, int mode); -void close(fd_t file); -size_t read(fd_t file, size_t offset, size_t len, char *buf); -size_t write(fd_t file, size_t offset, size_t len, const char* buf); -bool readdir(fd_t file, size_t ent_no, dirent_t *d); -bool stat_open(fd_t file, stat_t *s); -int ioctl(fd_t file, int command, void* data); -int fctl(fd_t file, int command, void* data); -bool select(sel_fd_t* fds, size_t nfds, int timeout); - -fd_pair_t make_channel(bool blocking); -fd_t make_shm(size_t size); -bool gen_token(fd_t file, token_t *tok); -fd_t use_token(token_t *tok); - -bool make_fs(const char* name, const char* driver, fd_t source, const char* options); -bool fs_add_source(const char* fs, fd_t source, const char* options); -bool fs_subfs(const char* name, const char* orig_fs, const char* root, int ok_modes); -void fs_remove(const char* name); - -pid_t new_proc(); -bool bind_fs(pid_t pid, const char* new_name, const char* fs); -bool bind_subfs(pid_t pid, const char* new_name, const char* fs, const char* root, int ok_modes); -bool bind_make_fs(pid_t pid, const char* name, const char* driver, fd_t source, const char* options); -bool bind_fd(pid_t pid, fd_t new_fd, fd_t fd); -bool proc_exec(pid_t pid, const char* file); -bool proc_status(pid_t pid, proc_status_t *s); -bool proc_kill(pid_t pid, proc_status_t *s); -void proc_wait(pid_t pid, bool wait, proc_status_t *s); - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libc/debug.c b/src/lib/libc/debug.c new file mode 100644 index 0000000..dc04fd3 --- /dev/null +++ b/src/lib/libc/debug.c @@ -0,0 +1,18 @@ +#include + +#include +#include + +void sys_panic(const char* msg, const char* file, int line) { + dbg_printf("PANIC in user process\n %s\n at %s:%d\n", msg, file, line); + exit(-1); + while(true); +} + +void sys_panic_assert(const char* assert, const char* file, int line) { + dbg_printf("ASSERT FAILED in user process\n %s\n at %s:%d\n", assert, file, line); + exit(-1); + while(true); +} + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libc/malloc.c b/src/lib/libc/malloc.c new file mode 100644 index 0000000..cb983fd --- /dev/null +++ b/src/lib/libc/malloc.c @@ -0,0 +1,70 @@ +#include +#include + +#include +#include + +#include + +static void* heap_alloc_pages(size_t s) { + void* addr = region_alloc(s, "Heap"); + if (addr == 0) return 0; + + bool map_ok = mmap(addr, s, FM_READ | FM_WRITE); + if (!map_ok) { + region_free(addr); + return 0; + } + + return addr; +} + +static void heap_free_pages(void* addr) { + munmap(addr); + region_free(addr); +} + +static mem_allocator_t *mem_allocator; +static slab_type_t slab_sizes[] = { + { "8B malloc objects", 8, 2 }, + { "16B malloc objects", 16, 2 }, + { "32B malloc objects", 32, 2 }, + { "64B malloc objects", 64, 4 }, + { "128B malloc objects", 128, 4 }, + { "256B malloc objects", 256, 4 }, + { "512B malloc objects", 512, 8 }, + { "1KB malloc objects", 1024, 8 }, + { "2KB malloc objects", 2048, 16 }, + { "4KB malloc objects", 4096, 16 }, + { 0, 0, 0 } +}; + +bool mmap_single_page(void* addr) { + return mmap(addr, PAGE_SIZE, MM_READ | MM_WRITE); +} + +void malloc_setup() { + region_allocator_init((void*)0x40000000, (void*)0x40000000, (void*)0xB0000000, mmap_single_page); + + mem_allocator = create_slab_allocator(slab_sizes, heap_alloc_pages, heap_free_pages); + + ASSERT(mem_allocator != 0); +} + +void* malloc(size_t size) { + if (size == 0) return 0; + + return slab_alloc(mem_allocator, size); +} + +void* calloc(size_t nmemb, size_t sz) { + void* r = malloc(nmemb * sz); + if (r != 0) memset(r, 0, nmemb * sz); + return r; +} + +void free(void* ptr) { + slab_free(mem_allocator, ptr); +} + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libc/start.c b/src/lib/libc/start.c new file mode 100644 index 0000000..49a6ca1 --- /dev/null +++ b/src/lib/libc/start.c @@ -0,0 +1,17 @@ +#include + +void malloc_setup(); + +int main(int, char**); + +void __libkogata_start() { + malloc_setup(); + + // TODO : more setup ? + + int ret = main(0, 0); + + exit(ret); +} + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libc/stdio.c b/src/lib/libc/stdio.c new file mode 100644 index 0000000..22be78e --- /dev/null +++ b/src/lib/libc/stdio.c @@ -0,0 +1,63 @@ +#include +#include + +#include +#include + + +fd_t stdio = 1; + +int getchar() { + char chr; + size_t sz = read(stdio, 0, 1, &chr); + ASSERT(sz == 1); + return chr; +} + + +int putchar(int c) { + char chr = c; + write(stdio, 0, 1, &chr); + return 0; //TODO what? +} + +int puts(const char* s) { + // TODO return EOF on error + return write(stdio, 0, strlen(s), s); +} + +void getline(char* buf, size_t l) { + size_t i = 0; + while (true) { + int c = getchar(); + if (c == '\n') { + putchar('\n'); + buf[i] = 0; + break; + } else if (c == '\b') { + if (i > 0) { + i--; + putchar('\b'); + } + } else if (c >= ' ') { + buf[i] = c; + if (i < l-1) { + i++; + putchar(c); + } + } + } +} + +int printf(const char* fmt, ...) { + va_list ap; + char buffer[256]; + + va_start(ap, fmt); + vsnprintf(buffer, 256, fmt, ap); + va_end(ap); + + return puts(buffer); +} + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libc/syscall.c b/src/lib/libc/syscall.c new file mode 100644 index 0000000..61b3471 --- /dev/null +++ b/src/lib/libc/syscall.c @@ -0,0 +1,204 @@ +#include +#include + +#include + +#include + +static inline uint32_t call(uint32_t a, uint32_t b, uint32_t c, uint32_t d, uint32_t ss, uint32_t dd) { + uint32_t ret; + asm volatile("int $0x40" + :"=a"(ret) + :"a"(a),"b"(b),"c"(c),"d"(d),"S"(ss),"D"(dd)); + return ret; +} + +void dbg_print(const char* str) { + call(SC_DBG_PRINT, (uint32_t)str, strlen(str), 0, 0, 0); +} + +void dbg_printf(const char* fmt, ...) { + va_list ap; + char buffer[256]; + + va_start(ap, fmt); + vsnprintf(buffer, 256, fmt, ap); + va_end(ap); + + dbg_print(buffer); +} + +void yield() { + call(SC_YIELD, 0, 0, 0, 0, 0); +} + +void exit(int code) { + call(SC_EXIT, code, 0, 0, 0, 0); +} + +void usleep(int usecs) { + call(SC_USLEEP, usecs, 0, 0, 0, 0); +} + +bool sys_new_thread(void* eip, void* esp) { + return call(SC_NEW_THREAD, (uint32_t)eip, (uint32_t)esp, 0, 0, 0); +} + +void exit_thread() { + call(SC_EXIT_THREAD, 0, 0, 0, 0, 0); +} + +bool mmap(void* addr, size_t size, int mode) { + return call(SC_MMAP, (uint32_t)addr, size, mode, 0, 0); +} +bool mmap_file(fd_t file, size_t offset, void* addr, size_t size, int mode) { + return call(SC_MMAP_FILE, file, offset, (uint32_t)addr, size, mode); +} +bool mchmap(void* addr, int mode) { + return call(SC_MCHMAP, (uint32_t)addr, mode, 0, 0, 0); +} +bool munmap(void* addr) { + return call(SC_MUNMAP, (uint32_t)addr, 0, 0, 0, 0); +} + +bool create(const char* name, int type) { + return call(SC_CREATE, (uint32_t)name, strlen(name), type, 0, 0); +} +bool delete(const char* name) { + return call(SC_CREATE, (uint32_t)name, strlen(name), 0, 0, 0); +} +bool move(const char* oldname, const char* newname) { + return call(SC_MOVE, (uint32_t)oldname, strlen(oldname), (uint32_t)newname, strlen(newname), 0); +} +bool stat(const char* name, stat_t *s) { + return call(SC_STAT, (uint32_t)name, strlen(name), (uint32_t)s, 0, 0); +} + +fd_t open(const char* name, int mode) { + return call(SC_OPEN, (uint32_t)name, strlen(name), mode, 0, 0); +} +void close(fd_t file) { + call(SC_CLOSE, file, 0, 0, 0, 0); +} +size_t read(fd_t file, size_t offset, size_t len, char *buf) { + return call(SC_READ, file, offset, len, (uint32_t)buf, 0); +} +size_t write(fd_t file, size_t offset, size_t len, const char* buf) { + return call(SC_WRITE, file, offset, len, (uint32_t)buf, 0); +} +bool readdir(fd_t file, size_t ent_no, dirent_t *d) { + return call(SC_READDIR, file, ent_no, (uint32_t)d, 0, 0); +} +bool stat_open(fd_t file, stat_t *s) { + return call(SC_STAT_OPEN, file, (uint32_t)s, 0, 0, 0); +} +int ioctl(fd_t file, int command, void* data) { + return call(SC_IOCTL, file, command, (uint32_t)data, 0, 0); +} +int fctl(fd_t file, int command, void *data) { + return call(SC_FCTL, file, command, (uint32_t)data, 0, 0); +} +bool select(sel_fd_t* fds, size_t nfds, int timeout) { + return call(SC_SELECT, (uint32_t)fds, nfds, timeout, 0, 0); +} + +fd_pair_t make_channel(bool blocking) { + fd_pair_t ret; + call(SC_MK_CHANNEL, blocking, (uint32_t)&ret, 0, 0, 0); + return ret; +} +fd_t make_shm(size_t s) { + return call(SC_MK_SHM, s, 0, 0, 0, 0); +} +bool gen_token(fd_t file, token_t *tok) { + return call(SC_GEN_TOKEN, file, (uint32_t)tok, 0, 0, 0); +} +fd_t use_token(token_t *tok) { + return call(SC_USE_TOKEN, (uint32_t)tok, 0, 0, 0, 0); +} + +bool make_fs(const char* name, const char* driver, fd_t source, const char* options) { + volatile sc_make_fs_args_t args = { + .driver = driver, + .driver_strlen = strlen(driver), + .fs_name = name, + .fs_name_strlen = strlen(name), + .source_fd = source, + .opts = options, + .opts_strlen = strlen(options), + .bind_to_pid = 0, + }; + return call(SC_MAKE_FS, (uint32_t)&args, 0, 0, 0, 0); +} +bool fs_add_source(const char* fs, fd_t source, const char* options) { + return call(SC_FS_ADD_SRC, (uint32_t)fs, strlen(fs), source, (uint32_t)options, strlen(options)); +} +bool fs_subfs(const char* name, const char* orig_fs, const char* root, int ok_modes) { + volatile sc_subfs_args_t args = { + .new_name = name, + .new_name_strlen = strlen(name), + .from_fs = orig_fs, + .from_fs_strlen = strlen(orig_fs), + .root = root, + .root_strlen = strlen(root), + .ok_modes = ok_modes, + .bind_to_pid = 0 + }; + return call(SC_SUBFS, (uint32_t)(&args), 0, 0, 0, 0); +} +void fs_remove(const char* name) { + call(SC_RM_FS, (uint32_t)name, strlen(name), 0, 0, 0); +} + +pid_t new_proc() { + return call(SC_NEW_PROC, 0, 0, 0, 0, 0); +} +bool bind_fs(pid_t pid, const char* new_name, const char* fs) { + return call(SC_BIND_FS, pid, (uint32_t)new_name, strlen(new_name), (uint32_t)fs, strlen(fs)); +} +bool bind_subfs(pid_t pid, const char* new_name, const char* orig_fs, const char* root, int ok_modes) { + sc_subfs_args_t args = { + .new_name = new_name, + .new_name_strlen = strlen(new_name), + .from_fs = orig_fs, + .from_fs_strlen = strlen(orig_fs), + .root = root, + .root_strlen = strlen(root), + .ok_modes = ok_modes, + .bind_to_pid = pid + }; + return call(SC_BIND_SUBFS, (uint32_t)&args, 0, 0, 0, 0); +} +bool bind_make_fs(pid_t pid, const char* name, const char* driver, fd_t source, const char* options) { + sc_make_fs_args_t args = { + .driver = driver, + .driver_strlen = strlen(driver), + .fs_name = name, + .fs_name_strlen = strlen(name), + .source_fd = source, + .opts = options, + .opts_strlen = strlen(options), + .bind_to_pid = pid, + }; + return call(SC_BIND_MAKE_FS, (uint32_t)&args, 0, 0, 0, 0); +} +bool bind_fd(pid_t pid, fd_t new_fd, fd_t fd) { + return call(SC_BIND_FD, pid, new_fd, fd, 0, 0); +} +bool proc_exec(pid_t pid, const char* file) { + return call(SC_PROC_EXEC, pid, (uint32_t)file, strlen(file), 0, 0); +} +bool proc_status(pid_t pid, proc_status_t *s) { + return call(SC_PROC_STATUS, pid, (uint32_t)s, 0, 0, 0); +} +bool proc_kill(pid_t pid, proc_status_t *s) { + return call(SC_PROC_KILL, pid, (uint32_t)s, 0, 0, 0); +} +void proc_wait(pid_t pid, bool block, proc_status_t *s) { + call(SC_PROC_WAIT, pid, block, (uint32_t)s, 0, 0); +} + + + + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libc/unistd.c b/src/lib/libc/unistd.c new file mode 100644 index 0000000..5ae1735 --- /dev/null +++ b/src/lib/libc/unistd.c @@ -0,0 +1,66 @@ +#include +#include + +#include + + +char cwd_buf[256]; + +char* getcwd(char* buf, size_t buf_len) { + if (buf_len > strlen(cwd_buf)) { + strcpy(buf, cwd_buf); + return buf; + } else { + return 0; + } +} + +int chdir(const char* path) { + char cwd_buf2[256]; + strcpy(cwd_buf2, cwd_buf); + + if (!pathncat(cwd_buf2, path, 256)) return -1; + + stat_t st; + if (!stat(cwd_buf2, &st)) return -1; + if (!(st.type & FT_DIR)) return -1; + + strcpy(cwd_buf, cwd_buf2); + return 0; +} + +char* pathncat(char* buf, const char* add, size_t buf_len) { + if (strchr(add, ':')) { + if (strlen(add) < buf_len) { + strcpy(buf, add); + return buf; + } else { + return 0; + } + } else { + char* sep_init = strchr(buf, ':'); + if (add[0] == '/') { + if (strlen(add) + (sep_init + 1 - buf) < buf_len) { + strcpy(sep_init + 1, add); + return buf; + } else { + return 0; + } + } else { + //TODO: simplify '..' + char* end = buf + strlen(buf) - 1; + if (*end != '/') end++; + if (end + 1 - buf + strlen(add) < buf_len) { + *end = '/'; + strcpy(end + 1, add); + return buf; + } else { + return 0; + } + } + return 0; + } +} + + +/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libkogata/debug.c b/src/lib/libkogata/debug.c deleted file mode 100644 index 847ecca..0000000 --- a/src/lib/libkogata/debug.c +++ /dev/null @@ -1,19 +0,0 @@ -#include - -#include - -#include - -void sys_panic(const char* msg, const char* file, int line) { - dbg_printf("PANIC in user process\n %s\n at %s:%d\n", msg, file, line); - exit(-1); - while(true); -} - -void sys_panic_assert(const char* assert, const char* file, int line) { - dbg_printf("ASSERT FAILED in user process\n %s\n at %s:%d\n", assert, file, line); - exit(-1); - while(true); -} - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libkogata/draw.c b/src/lib/libkogata/draw.c index 2806df4..d988cb9 100644 --- a/src/lib/libkogata/draw.c +++ b/src/lib/libkogata/draw.c @@ -1,13 +1,13 @@ -#include -#include +#include #include -#include #include -#include +#include +#include -#include +#include +#include fb_t *g_fb_from_file(fd_t file, fb_info_t *geom) { fb_t *ret = (fb_t*)malloc(sizeof(fb_t)); diff --git a/src/lib/libkogata/gip.c b/src/lib/libkogata/gip.c index cdfeb71..5b1e44d 100644 --- a/src/lib/libkogata/gip.c +++ b/src/lib/libkogata/gip.c @@ -1,7 +1,7 @@ #include -#include +#include -#include +#include typedef struct { gip_reply_callback_t cb; diff --git a/src/lib/libkogata/keyboard.c b/src/lib/libkogata/keyboard.c index 505c048..e7fb08b 100644 --- a/src/lib/libkogata/keyboard.c +++ b/src/lib/libkogata/keyboard.c @@ -1,11 +1,12 @@ -#include +#include #include -#include - -#include #include -#include + +#include +#include + +#include // ---- Control keys that are not KBD_CHAR-able diff --git a/src/lib/libkogata/mainloop.c b/src/lib/libkogata/mainloop.c index 58966dd..bce1174 100644 --- a/src/lib/libkogata/mainloop.c +++ b/src/lib/libkogata/mainloop.c @@ -1,7 +1,7 @@ -#include +#include #include -#include +#include mainloop_fd_t *mainloop_fds = 0; bool mainloop_fds_change = false; diff --git a/src/lib/libkogata/malloc.c b/src/lib/libkogata/malloc.c deleted file mode 100644 index 3777123..0000000 --- a/src/lib/libkogata/malloc.c +++ /dev/null @@ -1,70 +0,0 @@ -#include -#include - -#include - -#include -#include - -static void* heap_alloc_pages(size_t s) { - void* addr = region_alloc(s, "Heap"); - if (addr == 0) return 0; - - bool map_ok = mmap(addr, s, FM_READ | FM_WRITE); - if (!map_ok) { - region_free(addr); - return 0; - } - - return addr; -} - -static void heap_free_pages(void* addr) { - munmap(addr); - region_free(addr); -} - -static mem_allocator_t *mem_allocator; -static slab_type_t slab_sizes[] = { - { "8B malloc objects", 8, 2 }, - { "16B malloc objects", 16, 2 }, - { "32B malloc objects", 32, 2 }, - { "64B malloc objects", 64, 4 }, - { "128B malloc objects", 128, 4 }, - { "256B malloc objects", 256, 4 }, - { "512B malloc objects", 512, 8 }, - { "1KB malloc objects", 1024, 8 }, - { "2KB malloc objects", 2048, 16 }, - { "4KB malloc objects", 4096, 16 }, - { 0, 0, 0 } -}; - -bool mmap_single_page(void* addr) { - return mmap(addr, PAGE_SIZE, MM_READ | MM_WRITE); -} - -void malloc_setup() { - region_allocator_init((void*)0x40000000, (void*)0x40000000, (void*)0xB0000000, mmap_single_page); - - mem_allocator = create_slab_allocator(slab_sizes, heap_alloc_pages, heap_free_pages); - - ASSERT(mem_allocator != 0); -} - -void* malloc(size_t size) { - if (size == 0) return 0; - - return slab_alloc(mem_allocator, size); -} - -void* calloc(size_t nmemb, size_t sz) { - void* r = malloc(nmemb * sz); - if (r != 0) memset(r, 0, nmemb * sz); - return r; -} - -void free(void* ptr) { - slab_free(mem_allocator, ptr); -} - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libkogata/start.c b/src/lib/libkogata/start.c deleted file mode 100644 index bd22d7a..0000000 --- a/src/lib/libkogata/start.c +++ /dev/null @@ -1,17 +0,0 @@ -#include - -void malloc_setup(); - -int main(int, char**); - -void __libkogata_start() { - malloc_setup(); - - // TODO : more setup ? - - int ret = main(0, 0); - - exit(ret); -} - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libkogata/stdio.c b/src/lib/libkogata/stdio.c deleted file mode 100644 index 94dec22..0000000 --- a/src/lib/libkogata/stdio.c +++ /dev/null @@ -1,63 +0,0 @@ -#include -#include - -#include -#include - - -fd_t stdio = 1; - -int getchar() { - char chr; - size_t sz = read(stdio, 0, 1, &chr); - ASSERT(sz == 1); - return chr; -} - - -int putchar(int c) { - char chr = c; - write(stdio, 0, 1, &chr); - return 0; //TODO what? -} - -int puts(const char* s) { - // TODO return EOF on error - return write(stdio, 0, strlen(s), s); -} - -void getline(char* buf, size_t l) { - size_t i = 0; - while (true) { - int c = getchar(); - if (c == '\n') { - putchar('\n'); - buf[i] = 0; - break; - } else if (c == '\b') { - if (i > 0) { - i--; - putchar('\b'); - } - } else if (c >= ' ') { - buf[i] = c; - if (i < l-1) { - i++; - putchar(c); - } - } - } -} - -int printf(const char* fmt, ...) { - va_list ap; - char buffer[256]; - - va_start(ap, fmt); - vsnprintf(buffer, 256, fmt, ap); - va_end(ap); - - return puts(buffer); -} - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libkogata/syscall.c b/src/lib/libkogata/syscall.c deleted file mode 100644 index bf0b35e..0000000 --- a/src/lib/libkogata/syscall.c +++ /dev/null @@ -1,203 +0,0 @@ -#include -#include - -#include -#include - -static inline uint32_t call(uint32_t a, uint32_t b, uint32_t c, uint32_t d, uint32_t ss, uint32_t dd) { - uint32_t ret; - asm volatile("int $0x40" - :"=a"(ret) - :"a"(a),"b"(b),"c"(c),"d"(d),"S"(ss),"D"(dd)); - return ret; -} - -void dbg_print(const char* str) { - call(SC_DBG_PRINT, (uint32_t)str, strlen(str), 0, 0, 0); -} - -void dbg_printf(const char* fmt, ...) { - va_list ap; - char buffer[256]; - - va_start(ap, fmt); - vsnprintf(buffer, 256, fmt, ap); - va_end(ap); - - dbg_print(buffer); -} - -void yield() { - call(SC_YIELD, 0, 0, 0, 0, 0); -} - -void exit(int code) { - call(SC_EXIT, code, 0, 0, 0, 0); -} - -void usleep(int usecs) { - call(SC_USLEEP, usecs, 0, 0, 0, 0); -} - -bool sys_new_thread(void* eip, void* esp) { - return call(SC_NEW_THREAD, (uint32_t)eip, (uint32_t)esp, 0, 0, 0); -} - -void exit_thread() { - call(SC_EXIT_THREAD, 0, 0, 0, 0, 0); -} - -bool mmap(void* addr, size_t size, int mode) { - return call(SC_MMAP, (uint32_t)addr, size, mode, 0, 0); -} -bool mmap_file(fd_t file, size_t offset, void* addr, size_t size, int mode) { - return call(SC_MMAP_FILE, file, offset, (uint32_t)addr, size, mode); -} -bool mchmap(void* addr, int mode) { - return call(SC_MCHMAP, (uint32_t)addr, mode, 0, 0, 0); -} -bool munmap(void* addr) { - return call(SC_MUNMAP, (uint32_t)addr, 0, 0, 0, 0); -} - -bool create(const char* name, int type) { - return call(SC_CREATE, (uint32_t)name, strlen(name), type, 0, 0); -} -bool delete(const char* name) { - return call(SC_CREATE, (uint32_t)name, strlen(name), 0, 0, 0); -} -bool move(const char* oldname, const char* newname) { - return call(SC_MOVE, (uint32_t)oldname, strlen(oldname), (uint32_t)newname, strlen(newname), 0); -} -bool stat(const char* name, stat_t *s) { - return call(SC_STAT, (uint32_t)name, strlen(name), (uint32_t)s, 0, 0); -} - -fd_t open(const char* name, int mode) { - return call(SC_OPEN, (uint32_t)name, strlen(name), mode, 0, 0); -} -void close(fd_t file) { - call(SC_CLOSE, file, 0, 0, 0, 0); -} -size_t read(fd_t file, size_t offset, size_t len, char *buf) { - return call(SC_READ, file, offset, len, (uint32_t)buf, 0); -} -size_t write(fd_t file, size_t offset, size_t len, const char* buf) { - return call(SC_WRITE, file, offset, len, (uint32_t)buf, 0); -} -bool readdir(fd_t file, size_t ent_no, dirent_t *d) { - return call(SC_READDIR, file, ent_no, (uint32_t)d, 0, 0); -} -bool stat_open(fd_t file, stat_t *s) { - return call(SC_STAT_OPEN, file, (uint32_t)s, 0, 0, 0); -} -int ioctl(fd_t file, int command, void* data) { - return call(SC_IOCTL, file, command, (uint32_t)data, 0, 0); -} -int fctl(fd_t file, int command, void *data) { - return call(SC_FCTL, file, command, (uint32_t)data, 0, 0); -} -bool select(sel_fd_t* fds, size_t nfds, int timeout) { - return call(SC_SELECT, (uint32_t)fds, nfds, timeout, 0, 0); -} - -fd_pair_t make_channel(bool blocking) { - fd_pair_t ret; - call(SC_MK_CHANNEL, blocking, (uint32_t)&ret, 0, 0, 0); - return ret; -} -fd_t make_shm(size_t s) { - return call(SC_MK_SHM, s, 0, 0, 0, 0); -} -bool gen_token(fd_t file, token_t *tok) { - return call(SC_GEN_TOKEN, file, (uint32_t)tok, 0, 0, 0); -} -fd_t use_token(token_t *tok) { - return call(SC_USE_TOKEN, (uint32_t)tok, 0, 0, 0, 0); -} - -bool make_fs(const char* name, const char* driver, fd_t source, const char* options) { - volatile sc_make_fs_args_t args = { - .driver = driver, - .driver_strlen = strlen(driver), - .fs_name = name, - .fs_name_strlen = strlen(name), - .source_fd = source, - .opts = options, - .opts_strlen = strlen(options), - .bind_to_pid = 0, - }; - return call(SC_MAKE_FS, (uint32_t)&args, 0, 0, 0, 0); -} -bool fs_add_source(const char* fs, fd_t source, const char* options) { - return call(SC_FS_ADD_SRC, (uint32_t)fs, strlen(fs), source, (uint32_t)options, strlen(options)); -} -bool fs_subfs(const char* name, const char* orig_fs, const char* root, int ok_modes) { - volatile sc_subfs_args_t args = { - .new_name = name, - .new_name_strlen = strlen(name), - .from_fs = orig_fs, - .from_fs_strlen = strlen(orig_fs), - .root = root, - .root_strlen = strlen(root), - .ok_modes = ok_modes, - .bind_to_pid = 0 - }; - return call(SC_SUBFS, (uint32_t)(&args), 0, 0, 0, 0); -} -void fs_remove(const char* name) { - call(SC_RM_FS, (uint32_t)name, strlen(name), 0, 0, 0); -} - -pid_t new_proc() { - return call(SC_NEW_PROC, 0, 0, 0, 0, 0); -} -bool bind_fs(pid_t pid, const char* new_name, const char* fs) { - return call(SC_BIND_FS, pid, (uint32_t)new_name, strlen(new_name), (uint32_t)fs, strlen(fs)); -} -bool bind_subfs(pid_t pid, const char* new_name, const char* orig_fs, const char* root, int ok_modes) { - sc_subfs_args_t args = { - .new_name = new_name, - .new_name_strlen = strlen(new_name), - .from_fs = orig_fs, - .from_fs_strlen = strlen(orig_fs), - .root = root, - .root_strlen = strlen(root), - .ok_modes = ok_modes, - .bind_to_pid = pid - }; - return call(SC_BIND_SUBFS, (uint32_t)&args, 0, 0, 0, 0); -} -bool bind_make_fs(pid_t pid, const char* name, const char* driver, fd_t source, const char* options) { - sc_make_fs_args_t args = { - .driver = driver, - .driver_strlen = strlen(driver), - .fs_name = name, - .fs_name_strlen = strlen(name), - .source_fd = source, - .opts = options, - .opts_strlen = strlen(options), - .bind_to_pid = pid, - }; - return call(SC_BIND_MAKE_FS, (uint32_t)&args, 0, 0, 0, 0); -} -bool bind_fd(pid_t pid, fd_t new_fd, fd_t fd) { - return call(SC_BIND_FD, pid, new_fd, fd, 0, 0); -} -bool proc_exec(pid_t pid, const char* file) { - return call(SC_PROC_EXEC, pid, (uint32_t)file, strlen(file), 0, 0); -} -bool proc_status(pid_t pid, proc_status_t *s) { - return call(SC_PROC_STATUS, pid, (uint32_t)s, 0, 0, 0); -} -bool proc_kill(pid_t pid, proc_status_t *s) { - return call(SC_PROC_KILL, pid, (uint32_t)s, 0, 0, 0); -} -void proc_wait(pid_t pid, bool block, proc_status_t *s) { - call(SC_PROC_WAIT, pid, block, (uint32_t)s, 0, 0); -} - - - - -/* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/src/lib/libkogata/unistd.c b/src/lib/libkogata/unistd.c deleted file mode 100644 index 101e02e..0000000 --- a/src/lib/libkogata/unistd.c +++ /dev/null @@ -1,67 +0,0 @@ -#include - -#include - -#include - - -char cwd_buf[256]; - -char* getcwd(char* buf, size_t buf_len) { - if (buf_len > strlen(cwd_buf)) { - strcpy(buf, cwd_buf); - return buf; - } else { - return 0; - } -} - -int chdir(const char* path) { - char cwd_buf2[256]; - strcpy(cwd_buf2, cwd_buf); - - if (!pathncat(cwd_buf2, path, 256)) return -1; - - stat_t st; - if (!stat(cwd_buf2, &st)) return -1; - if (!(st.type & FT_DIR)) return -1; - - strcpy(cwd_buf, cwd_buf2); - return 0; -} - -char* pathncat(char* buf, const char* add, size_t buf_len) { - if (strchr(add, ':')) { - if (strlen(add) < buf_len) { - strcpy(buf, add); - return buf; - } else { - return 0; - } - } else { - char* sep_init = strchr(buf, ':'); - if (add[0] == '/') { - if (strlen(add) + (sep_init + 1 - buf) < buf_len) { - strcpy(sep_init + 1, add); - return buf; - } else { - return 0; - } - } else { - //TODO: simplify '..' - char* end = buf + strlen(buf) - 1; - if (*end != '/') end++; - if (end + 1 - buf + strlen(add) < buf_len) { - *end = '/'; - strcpy(end + 1, add); - return buf; - } else { - return 0; - } - } - return 0; - } -} - - -/* vim: set ts=4 sw=4 tw=0 noet :*/ -- cgit v1.2.3