From 236963e7563be3e3f8220dac7bb4af446928e194 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Mon, 24 Jun 2024 22:55:29 -0400 Subject: Clean out for expt Signed-off-by: Ian Moffett --- lib/libc/include/bits/_lock.h | 62 ------------------------------------------ lib/libc/include/bits/_types.h | 47 -------------------------------- 2 files changed, 109 deletions(-) delete mode 100644 lib/libc/include/bits/_lock.h delete mode 100644 lib/libc/include/bits/_types.h (limited to 'lib/libc/include/bits') diff --git a/lib/libc/include/bits/_lock.h b/lib/libc/include/bits/_lock.h deleted file mode 100644 index 633ac31..0000000 --- a/lib/libc/include/bits/_lock.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Hyra nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _BITS__LOCK_H -#define _BITS__LOCK_H - -#include - -typedef struct { - volatile __uint8_t lock; -} __libc_spinlock_t; - -#if defined(__x86_64__) -__attribute__((__always_inline__)) inline int -__test_and_set(__libc_spinlock_t *lock) -{ - int tmp = 0; - - __asm__ __volatile__( - "lock; cmpxchgb %b2, %0" - : "+m" (lock->lock), "+a" (tmp) - : "r" (1) - : "cc" - ); - - return tmp; -} -#else -#warn "Unimplemented arch" -#endif - -#define __spinlock_def(NAME) __libc_spinlock_t NAME = {0}; -#define __spinlock_acquire(LOCKPTR) while (__test_and_set(LOCKPTR)) -#define __spinlock_release(LOCKPTR) ((LOCKPTR)->lock = 0) - -#endif /* _BITS__LOCK_H */ diff --git a/lib/libc/include/bits/_types.h b/lib/libc/include/bits/_types.h deleted file mode 100644 index 5f84e5e..0000000 --- a/lib/libc/include/bits/_types.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Hyra nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _BITS__TYPES_H -#define _BITS__TYPES_H - -typedef unsigned long __size_t; -typedef long __ssize_t; -typedef long __ptrdiff_t; - -typedef __UINT8_TYPE__ __uint8_t; -typedef __UINT16_TYPE__ __uint16_t; -typedef __UINT32_TYPE__ __uint32_t; -typedef __UINT64_TYPE__ __uint64_t; - -typedef __INT8_TYPE__ __int8_t; -typedef __INT16_TYPE__ __int16_t; -typedef __INT32_TYPE__ __int32_t; -typedef __INT64_TYPE__ __int64_t; - -#endif /* !_BITS__TYPES_H */ -- cgit v1.2.3