[USER] Temporary write syscall
This commit is contained in:
parent
1693baaf6b
commit
19df873615
@ -1,9 +1,18 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <stdlib.h>
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
(void) argc;
|
(void) argc;
|
||||||
(void) argv;
|
(void) argv;
|
||||||
|
printf("Hello, world!\n");
|
||||||
|
printf("Some numbers:%d\n", 12345);
|
||||||
|
printf("And hex:%#x\n", 0xabcdef);
|
||||||
|
printf("And a string:%s\n", "Hello!");
|
||||||
|
|
||||||
|
printf("Arguments passed to init:\n");
|
||||||
|
for(int i=0; i < argc; i++)
|
||||||
|
printf("%d: %s\n", i, argv[i]);
|
||||||
for(;;);
|
for(;;);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -2,11 +2,14 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <int.h>
|
#include <int.h>
|
||||||
#include <sync.h>
|
#include <sync.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
#define debug(...) ({spin_lock(&debug_lock);debug_printf(__VA_ARGS__);spin_unlock(&debug_lock);})
|
#define debug(...) ({spin_lock(&debug_lock);debug_printf(__VA_ARGS__);spin_unlock(&debug_lock);})
|
||||||
|
#define debugn(str, n) ({spin_lock(&debug_lock);debug_putsn((str), (n)); spin_unlock(&debug_lock);})
|
||||||
#else
|
#else
|
||||||
#define debug(...) ((void)0)
|
#define debug(...) ((void)0)
|
||||||
|
#define debugn(...) ((void)0)
|
||||||
#endif
|
#endif
|
||||||
#define debug_info(...) do{debug("[INFO] ");debug(__VA_ARGS__);}while(0)
|
#define debug_info(...) do{debug("[INFO] ");debug(__VA_ARGS__);}while(0)
|
||||||
#define debug_ok(...) do{debug("[OK] ");debug(__VA_ARGS__);}while(0)
|
#define debug_ok(...) do{debug("[OK] ");debug(__VA_ARGS__);}while(0)
|
||||||
|
@ -39,3 +39,5 @@ typedef long (*syscall_handler_t)(long num, long, long, long, long, long, long);
|
|||||||
#define SYSCALL_INIT(...) _SYSCALL_INIT(_SYSCALL_INIT,__VA_ARGS__)
|
#define SYSCALL_INIT(...) _SYSCALL_INIT(_SYSCALL_INIT,__VA_ARGS__)
|
||||||
|
|
||||||
#define SYSCALL_REGISTER(name, num) syscall_handlers[num] = syscall_##name
|
#define SYSCALL_REGISTER(name, num) syscall_handlers[num] = syscall_##name
|
||||||
|
|
||||||
|
SYSCALL_DECL(write);
|
||||||
|
20
kernel/syscall/sys_fs.c
Normal file
20
kernel/syscall/sys_fs.c
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
#include <syscall.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <debug.h>
|
||||||
|
#include <mem.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
SYSCALL_DEF(write)
|
||||||
|
{
|
||||||
|
SYSCALL_INIT(int, fd, void *, buffer, size_t, nbyte);
|
||||||
|
|
||||||
|
|
||||||
|
if(fd == 1)
|
||||||
|
{
|
||||||
|
debugn(buffer, nbyte);
|
||||||
|
return nbyte;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
@ -5,6 +5,7 @@
|
|||||||
#include <gdt.h>
|
#include <gdt.h>
|
||||||
#include <registers.h>
|
#include <registers.h>
|
||||||
#include "../../libc/syscall_num.h"
|
#include "../../libc/syscall_num.h"
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
extern void syscall_entry();
|
extern void syscall_entry();
|
||||||
|
|
||||||
@ -34,6 +35,7 @@ registers_t *syscall_handler(registers_t *r)
|
|||||||
}
|
}
|
||||||
|
|
||||||
debug_error("Unknown syscall, No:%d\n", r->rax);
|
debug_error("Unknown syscall, No:%d\n", r->rax);
|
||||||
|
|
||||||
debug("syscall_%d(%x, %x, %x, %x, %x, %x)\n", r->rax, r->rdi, r->rsi, r->rdx, r->r10, r->r8, r->r9);
|
debug("syscall_%d(%x, %x, %x, %x, %x, %x)\n", r->rax, r->rdi, r->rsi, r->rdx, r->r10, r->r8, r->r9);
|
||||||
for(;;);
|
for(;;);
|
||||||
}
|
}
|
||||||
@ -54,6 +56,7 @@ void syscall_init()
|
|||||||
memset(syscall_handlers, 0, 1024*sizeof(syscall_handler_t));
|
memset(syscall_handlers, 0, 1024*sizeof(syscall_handler_t));
|
||||||
|
|
||||||
SYSCALL_REGISTER(debug, SYS_DEBUG);
|
SYSCALL_REGISTER(debug, SYS_DEBUG);
|
||||||
|
SYSCALL_REGISTER(write, SYS_WRITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
38
libc/file_io.c
Normal file
38
libc/file_io.c
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
#include "syscalls.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/uio.h>
|
||||||
|
|
||||||
|
SYSCALL_DEF(ioctl)
|
||||||
|
{
|
||||||
|
SYSCALL_INIT(int, fd, unsigned long, request);
|
||||||
|
|
||||||
|
if(fd == 1 && request == TIOCGWINSZ)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
kernel_debug("==> IOCTL - unsupported request:%lx\n", request);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
SYSCALL_DEF(writev)
|
||||||
|
{
|
||||||
|
SYSCALL_INIT(int, fd, const struct iovec *, iov, int, iovcnt);
|
||||||
|
|
||||||
|
size_t len = 0;
|
||||||
|
|
||||||
|
for(int i=0; i < iovcnt; i++)
|
||||||
|
{
|
||||||
|
len += write(fd, iov[i].iov_base, iov[i].iov_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (long)len;
|
||||||
|
}
|
||||||
|
|
||||||
|
SYSCALL_DEF(write)
|
||||||
|
{
|
||||||
|
SYSCALL_INIT(int, fd, void *, buffer, size_t, nbyte);
|
||||||
|
|
||||||
|
return kernel_syscall(SYS_WRITE, fd, buffer, nbyte);
|
||||||
|
}
|
@ -1,3 +1,4 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#define SYS_WRITE 0x001
|
||||||
#define SYS_DEBUG 0x3FF
|
#define SYS_DEBUG 0x3FF
|
||||||
|
Loading…
x
Reference in New Issue
Block a user