Imbus/neptune
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Imbus:c38a0cbf41ed2550295657892b053695a854930c
Branches Tags
Imbus:master
Imbus:dev
Imbus:v0.0.2
Imbus:v0.0.1
..
compare: Imbus:e15b705eda11b2742c724a2973bee33211f499bb
Branches Tags
Imbus:master
Imbus:dev
Imbus:v0.0.2
Imbus:v0.0.1

3 commits
c38a0cbf41 ... e15b705eda

Author SHA1 Message Date
Imbus
e15b705eda Enable pop_off and push_off in spinlocks 2025-09-02 04:30:00 +02:00
Imbus
595ae0a8e2 Clean up string.c, remove unused duplicates 2025-09-02 04:29:24 +02:00
Imbus
f98500001c Fix include in endian.h 2025-09-02 04:29:05 +02:00
3 changed files with 10 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kern/libkern/endian.h
View file

@ -1,7 +1,7 @@
#ifndef ENDIAN_KERNEL_H #ifndef ENDIAN_KERNEL_H
#define ENDIAN_KERNEL_H #define ENDIAN_KERNEL_H
#include <types.h> #include <stdint.h>
/** Swap byte order of 16-bit value */ /** Swap byte order of 16-bit value */
static inline u16 swap16(u16 x) { static inline u16 swap16(u16 x) {

17
kern/libkern/spinlock.c
View file

@ -67,7 +67,7 @@ uint32_t pop_off(void) {
PANIC("pop_off - interruptible"); PANIC("pop_off - interruptible");
if (cpu->noff < 1) if (cpu->noff < 1)
PANIC("pop_off"); PANIC("pop_off when cpu->noff < 1");
cpu->noff -= 1; cpu->noff -= 1;
@ -89,8 +89,8 @@ __attribute__((warn_unused_result)) bool spin_trylock(spinlock_t *l) {
} }
void spin_unlock(spinlock_t *l) { void spin_unlock(spinlock_t *l) {
// if (!spin_is_holding(l)) if (!spin_is_holding(l))
// panic("spin_unlock"); PANIC("Unlocking a spinlock that is not held by the locking cpu!");
l->cpu = 0; l->cpu = 0;
@ -98,10 +98,10 @@ void spin_unlock(spinlock_t *l) {
uint32_t dummy; uint32_t dummy;
__asm__ volatile("amoswap.w.rl %0, %2, (%1)\n" : "=&r"(dummy) : "r"(&l->v), "r"(0u) : "memory"); __asm__ volatile("amoswap.w.rl %0, %2, (%1)\n" : "=&r"(dummy) : "r"(&l->v), "r"(0u) : "memory");
// __sync_synchronize(); // No loads/stores after this point __sync_synchronize(); // No loads/stores after this point
// __sync_lock_release(&lk->locked); // Essentially lk->locked = 0 // __sync_lock_release(&lk->locked); // Essentially lk->locked = 0
// pop_off(); pop_off();
} }
/** /**
@ -110,8 +110,11 @@ void spin_unlock(spinlock_t *l) {
void spin_lock(spinlock_t *l) { void spin_lock(spinlock_t *l) {
uint32_t backoff = 1; uint32_t backoff = 1;
for (;;) { for (;;) {
if (spin_trylock(l)) if (spin_trylock(l)) {
l->cpu = mycpu();
push_off();
return; return;
}
while (__atomic_load_n(&l->v, __ATOMIC_RELAXED) != 0) { while (__atomic_load_n(&l->v, __ATOMIC_RELAXED) != 0) {
for (uint32_t i = 0; i < backoff; ++i) for (uint32_t i = 0; i < backoff; ++i)
@ -120,8 +123,6 @@ void spin_lock(spinlock_t *l) {
backoff <<= 1; backoff <<= 1;
} }
} }
l->cpu = mycpu();
} }
/** /**

45
kern/libkern/string.c
View file

@ -114,18 +114,6 @@ void *memset(void *dest, int c, size_t n) {
return dest; return dest;
} }
// int memcmp(const void *s1, const void *s2, size_t n) {
// if (n != 0) {
// const unsigned char *p1 = s1, *p2 = s2;
//
// do {
// if (*p1++ != *p2++)
// return (*--p1 - *--p2);
// } while (--n != 0);
// }
// return (0);
// }
char *itoa(int value, char *str, int base) { char *itoa(int value, char *str, int base) {
char *p = str; char *p = str;
char *p1, *p2; char *p1, *p2;
@ -166,39 +154,6 @@ char *itoa(int value, char *str, int base) {
return str; return str;
} }
// void *memset(void *dst, int c, size_t length) {
// u8 *ptr = (u8 *)dst;
// const u8 value = (u8)c;
//
// while (length--) *(ptr++) = value;
//
// return dst;
// }
// void *memcpy(void *dst, const void *src, size_t len) {
// u8 *d = (u8 *)dst;
// const u8 *s = (const u8 *)src;
// for (size_t i = 0; i < len; i++) {
// d[i] = s[i];
// }
// return dst;
// }
// void *memmove(void *dst, const void *src, size_t len) {
// u8 *d = (u8 *)dst;
// const u8 *s = (const u8 *)src;
// if (d < s) {
// for (size_t i = 0; i < len; i++) {
// d[i] = s[i];
// }
// } else if (d > s) {
// for (size_t i = len; i > 0; i--) {
// d[i - 1] = s[i - 1];
// }
// }
// return dst;
// }
int memcmp(const void *s1, const void *s2, size_t len) { int memcmp(const void *s1, const void *s2, size_t len) {
const u8 *a = (const u8 *)s1; const u8 *a = (const u8 *)s1;
const u8 *b = (const u8 *)s2; const u8 *b = (const u8 *)s2;