diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/inc/sys.h | 54 | ||||
| -rw-r--r-- | libc/random.c | 3 |
2 files changed, 40 insertions, 17 deletions
diff --git a/libc/inc/sys.h b/libc/inc/sys.h index bb5dec2..dc6aaf1 100644 --- a/libc/inc/sys.h +++ b/libc/inc/sys.h @@ -5,19 +5,28 @@ #define SYS_H enum sys { - SYS_LOOP, - SYS_MALLOC, - SYS_FREE, - SYS_READ, - SYS_WRITE, - SYS_EXEC, - SYS_EXIT, - SYS_TIME, - SYS_MAP, - SYS_UNMAP, - SYS_RESOLVE + SYS_LOOP, // To infinity and beyond (debug)! + SYS_MALLOC, // Allocate memory + SYS_FREE, // Free memory + SYS_READ, // Read file + SYS_WRITE, // Write to file + SYS_EXEC, // Execute path + SYS_EXIT, // Exit current process + SYS_TIME, // Get kernel time + SYS_MAP, // Map event to function + SYS_UNMAP, // Unmap event + SYS_RESOLVE, // Resolve event (needs to be executed at end of function) + SYS_SEND, // Send message to process + SYS_RECEIVE // Receive message (non-blocking/sync) }; enum event { EVENT_KEYBOARD, EVENT_MOUSE }; +enum message_type { MSG_NEW_WINDOW }; + +struct message { + int src; + enum message_type type; + void *data; +}; #if defined(userspace) @@ -34,19 +43,30 @@ int sysv(enum sys num, ...); */ #define loop() sys0(SYS_LOOP) -#define read(path) (void *)sys1(SYS_READ, (int)path) -#define write(path, buf) sys2(SYS_WRITE, (int)path, buf) -#define exec(path, ...) sysv(SYS_EXEC, (int)path, ##__VA_ARGS__) +#define read(path) (void *)sys1(SYS_READ, (int)(path)) +#define write(path, buf) sys2(SYS_WRITE, (int)(path), (buf)) +#define exec(path, ...) (int)sysv(SYS_EXEC, (int)(path), ##__VA_ARGS__) #define exit(status) \ { \ sys1(SYS_EXIT, (int)status); \ while (1) { \ } \ } -#define time() sys0(SYS_TIME) -#define event_map(id, func) sys2(SYS_MAP, (int)id, (int)func) -#define event_unmap(id, func) sys2(SYS_UNMAP, (int)id, (int)func) +#define time() (int)sys0(SYS_TIME) + +#define event_map(id, func) sys2(SYS_MAP, (int)(id), (int)(func)) +#define event_unmap(id, func) sys2(SYS_UNMAP, (int)(id), (int)(func)) #define event_resolve() sys0(SYS_RESOLVE) // TODO: Find method making event_resolve obsolete +#define msg_send(pid, type, msg) sys3(SYS_SEND, (int)(pid), (int)(type), (int)(msg)) +#define msg_receive() (struct message *)sys0(SYS_RECEIVE) +static inline struct message *msg_receive_loop() +{ + struct message *msg; + while (!(msg = msg_receive())) + ; + return msg; +} + #endif #endif diff --git a/libc/random.c b/libc/random.c index 7ad8a67..086fa11 100644 --- a/libc/random.c +++ b/libc/random.c @@ -19,6 +19,9 @@ u32 rand() char *randstr(u32 size) { + if (!size) + return NULL; + char *buf = malloc(size + 1); const char charset[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; |