aboutsummaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
Diffstat (limited to 'libc')
-rw-r--r--libc/cpu.c3
-rw-r--r--libc/inc/def.h2
-rw-r--r--libc/inc/list.h2
-rw-r--r--libc/inc/mem.h2
-rw-r--r--libc/inc/random.h2
-rw-r--r--libc/inc/serial.h2
-rw-r--r--libc/inc/stack.h2
-rw-r--r--libc/inc/str.h4
-rw-r--r--libc/inc/sys.h8
-rw-r--r--libc/list.c4
-rw-r--r--libc/mem.c22
-rw-r--r--libc/random.c2
-rw-r--r--libc/serial.c4
-rw-r--r--libc/stack.c4
-rw-r--r--libc/str.c8
15 files changed, 37 insertions, 34 deletions
diff --git a/libc/cpu.c b/libc/cpu.c
index 9ade464..08e742c 100644
--- a/libc/cpu.c
+++ b/libc/cpu.c
@@ -100,8 +100,9 @@ static u8 cpu_has_feature(u32 feature)
return (cpu_features & feature) != 0;
}
-static void fpu_handler()
+static void fpu_handler(struct regs *r)
{
+ UNUSED(r);
__asm__ volatile("clts");
}
diff --git a/libc/inc/def.h b/libc/inc/def.h
index 02a2990..8ff6d81 100644
--- a/libc/inc/def.h
+++ b/libc/inc/def.h
@@ -23,6 +23,8 @@ typedef unsigned long long u64;
* Macros
*/
+#define UNUSED(a) ((void)(a))
+
#define EOF (-1)
#define NULL ((void *)0)
diff --git a/libc/inc/list.h b/libc/inc/list.h
index 50b21c2..0b82b48 100644
--- a/libc/inc/list.h
+++ b/libc/inc/list.h
@@ -16,7 +16,7 @@ struct node {
struct node *prev;
};
-struct list *list_new();
+struct list *list_new(void);
void list_destroy(struct list *list);
/* struct node *list_new_node(); */ // TODO: Make node-specific things static/private?
/* void list_add_node(struct list *list, struct node *node); */
diff --git a/libc/inc/mem.h b/libc/inc/mem.h
index e4416dd..6c37844 100644
--- a/libc/inc/mem.h
+++ b/libc/inc/mem.h
@@ -5,8 +5,6 @@
#include <def.h>
-int malloc_allocated;
-
void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp);
void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp);
#define malloc(size) malloc_debug((u32)(size), __FILE__, __LINE__, __func__, #size)
diff --git a/libc/inc/random.h b/libc/inc/random.h
index 50c849b..59add9b 100644
--- a/libc/inc/random.h
+++ b/libc/inc/random.h
@@ -6,7 +6,7 @@
#include <def.h>
void srand(u32 seed);
-u32 rand();
+u32 rand(void);
char *randstr(u32 size);
#endif
diff --git a/libc/inc/serial.h b/libc/inc/serial.h
index 6511952..4d04d6a 100644
--- a/libc/inc/serial.h
+++ b/libc/inc/serial.h
@@ -3,7 +3,7 @@
#ifndef SERIAL_H
#define SERIAL_H
-void serial_install();
+void serial_install(void);
void serial_print(const char *data);
#endif
diff --git a/libc/inc/stack.h b/libc/inc/stack.h
index 16725f8..f5ad52b 100644
--- a/libc/inc/stack.h
+++ b/libc/inc/stack.h
@@ -16,7 +16,7 @@ struct stack {
struct stack_node *tail;
};
-struct stack *stack_new();
+struct stack *stack_new(void);
void stack_destroy(struct stack *stack);
u32 stack_empty(struct stack *stack);
u32 stack_push_bot(struct stack *stack, void *data);
diff --git a/libc/inc/str.h b/libc/inc/str.h
index 662cbe7..0ef49a6 100644
--- a/libc/inc/str.h
+++ b/libc/inc/str.h
@@ -8,8 +8,8 @@
u32 strlen(const char *s);
char *strcpy(char *dst, const char *src);
char *strncpy(char *dst, const char *src, u32 n);
-char *strchr(const char *s, int c);
-char *strrchr(const char *s, int c);
+char *strchr(char *s, int c);
+char *strrchr(char *s, int c);
char *strcat(char *dst, const char *src);
char *strncat(char *dst, const char *src, u32 n);
int strcmp(const char *s1, const char *s2);
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index be4352f..5858579 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -65,7 +65,7 @@ int sysv(enum sys num, ...);
* Syscall wrappers
*/
-#define loop() sys0(SYS_LOOP)
+#define loop(void) sys0(SYS_LOOP)
#define read(path, buf, offset, count) \
(s32) sys4(SYS_READ, (int)(path), (int)(buf), (int)(offset), (int)(count))
#define write(path, buf, offset, count) \
@@ -80,10 +80,10 @@ int sysv(enum sys num, ...);
yield(); \
} \
}
-#define yield() (int)sys0(SYS_YIELD)
-#define time() (u32) sys0(SYS_TIME)
+#define yield(void) (int)sys0(SYS_YIELD)
+#define time(void) (u32) sys0(SYS_TIME)
-static inline u32 getpid()
+static inline u32 getpid(void)
{
u32 buf = 0;
read("/proc/self/pid", &buf, 0, sizeof(buf));
diff --git a/libc/list.c b/libc/list.c
index 330d65d..f96fb27 100644
--- a/libc/list.c
+++ b/libc/list.c
@@ -6,7 +6,7 @@
static int nonce = 0;
-struct list *list_new()
+struct list *list_new(void)
{
struct list *list = malloc(sizeof(*list));
list->head = NULL;
@@ -29,7 +29,7 @@ void list_destroy(struct list *list)
list = NULL;
}
-static struct node *list_new_node()
+static struct node *list_new_node(void)
{
struct node *node = malloc(sizeof(*node));
node->data = NULL;
diff --git a/libc/mem.c b/libc/mem.c
index ba267f2..95e0a52 100644
--- a/libc/mem.c
+++ b/libc/mem.c
@@ -9,14 +9,16 @@ void *memcpy(void *dest, const void *src, u32 n)
{
#ifdef userspace
// Inspired by Jeko at osdev
+ u8 *dest_byte = dest;
+ const u8 *src_byte = src;
for (u32 i = 0; i < n / 16; i++) {
__asm__ volatile("movups (%0), %%xmm0\n"
- "movntdq %%xmm0, (%1)\n" ::"r"(src),
- "r"(dest)
+ "movntdq %%xmm0, (%1)\n" ::"r"(src_byte),
+ "r"(dest_byte)
: "memory");
- src = ((u8 *)src) + 16;
- dest = ((u8 *)dest) + 16;
+ src_byte += 16;
+ dest_byte += 16;
}
if (n & 7) {
@@ -32,18 +34,18 @@ void *memcpy(void *dest, const void *src, u32 n)
"movsb\n"
"2:"
: "=&c"(d0), "=&D"(d1), "=&S"(d2)
- : "0"(n / 4), "q"(n), "1"((long)dest), "2"((long)src)
+ : "0"(n / 4), "q"(n), "1"((long)dest_byte), "2"((long)src_byte)
: "memory");
}
- return dest;
+ return dest_byte;
#else
// Inspired by jgraef at osdev
u32 num_dwords = n / 4;
u32 num_bytes = n % 4;
u32 *dest32 = (u32 *)dest;
- u32 *src32 = (u32 *)src;
+ const u32 *src32 = (const u32 *)src;
u8 *dest8 = ((u8 *)dest) + num_dwords * 4;
- u8 *src8 = ((u8 *)src) + num_dwords * 4;
+ const u8 *src8 = ((const u8 *)src) + num_dwords * 4;
// TODO: What's faster?
__asm__ volatile("rep movsl\n"
@@ -89,11 +91,11 @@ void *memset(void *dest, int val, u32 n)
void *memchr(void *src, int c, u32 n)
{
- const u8 *s = (const u8 *)src;
+ u8 *s = (u8 *)src;
while (n-- > 0) {
if (*s == c)
- return (void *)s;
+ return s;
s++;
}
return NULL;
diff --git a/libc/random.c b/libc/random.c
index a2a8273..8c8076f 100644
--- a/libc/random.c
+++ b/libc/random.c
@@ -11,7 +11,7 @@ void srand(u32 seed)
g_seed = seed;
}
-u32 rand()
+u32 rand(void)
{
g_seed = g_seed * 1103515245 + 12345;
return (g_seed >> 16) & 0x7FFF;
diff --git a/libc/serial.c b/libc/serial.c
index 62263fb..b11ac26 100644
--- a/libc/serial.c
+++ b/libc/serial.c
@@ -5,7 +5,7 @@
#include <serial.h>
#include <str.h>
-void serial_install()
+void serial_install(void)
{
outb(0x3f8 + 1, 0x00);
outb(0x3f8 + 3, 0x80);
@@ -16,7 +16,7 @@ void serial_install()
outb(0x3f8 + 4, 0x0B);
}
-static int is_transmit_empty()
+static int is_transmit_empty(void)
{
return inb(0x3f8 + 5) & 0x20;
}
diff --git a/libc/stack.c b/libc/stack.c
index 0941e29..e86a8c6 100644
--- a/libc/stack.c
+++ b/libc/stack.c
@@ -6,7 +6,7 @@
static int nonce = 0;
-struct stack *stack_new()
+struct stack *stack_new(void)
{
struct stack *stack = malloc(sizeof(*stack));
stack->tail = NULL;
@@ -29,7 +29,7 @@ void stack_destroy(struct stack *stack)
stack = NULL;
}
-static struct stack_node *stack_new_node()
+static struct stack_node *stack_new_node(void)
{
struct stack_node *node = malloc(sizeof(*node));
node->data = NULL;
diff --git a/libc/str.c b/libc/str.c
index bf60d86..13ac27f 100644
--- a/libc/str.c
+++ b/libc/str.c
@@ -67,7 +67,7 @@ int strncmp(const char *s1, const char *s2, u32 n)
return d;
}
-char *strchr(const char *s, int c)
+char *strchr(char *s, int c)
{
while (*s != (char)c) {
if (!*s)
@@ -75,16 +75,16 @@ char *strchr(const char *s, int c)
s++;
}
- return (char *)s;
+ return s;
}
-char *strrchr(const char *s, int c)
+char *strrchr(char *s, int c)
{
char *ret = 0;
do {
if (*s == c)
- ret = (char *)s;
+ ret = s;
} while (*s++);
return ret;