apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

libc: Change bits/macros.h to use a __lc_ prefix for internal macros

Browse Source 
That way, we don't pollute user programs with our own 'noreturn' and 'deprecated' macros
This commit is contained in:
apio 2022-10-15 09:52:37 +02:00
parent 1043b0772d
commit 8398b2e2e4
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/libc/include/bits/macros.h
View File

@ -1,8 +1,8 @@
#ifndef _BITS_MACROS_H
#define _BITS_MACROS_H
#define noreturn __attribute__((noreturn))
#define align(n) __attribute__((aligned(n)))
#define deprecated(msg) __attribute__((deprecated(msg)))
#define __lc_noreturn __attribute__((noreturn))
#define __lc_align(n) __attribute__((aligned(n)))
#define __lc_deprecated(msg) __attribute__((deprecated(msg)))
#endif

2
libs/libc/include/luna.h
View File

@ -16,7 +16,7 @@ extern "C"
unsigned int msleep(unsigned int ms);
/* Prints a message to standard error and aborts the program. */
noreturn void __luna_abort(const char* message);
__lc_noreturn void __luna_abort(const char* message);
#ifdef __cplusplus
}

4
libs/libc/include/stdlib.h
View File

@ -10,10 +10,10 @@ extern "C"
#endif
/* Aborts the program. */
noreturn void abort();
__lc_noreturn void abort();
/* Normally exits the program with the specified status code. */
noreturn void exit(int status);
__lc_noreturn void exit(int status);
/* Registers a handler function to be run at normal program termination. */
int atexit(void (*handler)(void));

8
libs/libc/include/string.h
View File

@ -22,8 +22,8 @@ extern "C"
size_t strlen(const char* str);
/* Copies the string src into dest. This function is unsafe, use strncpy instead. */
deprecated("strcpy is unsafe and should not be used; use strncpy instead") char* strcpy(char* dest,
const char* src);
__lc_deprecated("strcpy is unsafe and should not be used; use strncpy instead") char* strcpy(char* dest,
const char* src);
/* Copies at most max bytes from the string src into dest. */
char* strncpy(char* dest, const char* src, size_t max);
@ -32,8 +32,8 @@ extern "C"
char* strchr(const char* str, int c);
/* Concatenates the string src into dest. This function is unsafe, use strncat instead. */
deprecated("strcat is unsafe and should not be used; use strncat instead") char* strcat(char* dest,
const char* src);
__lc_deprecated("strcat is unsafe and should not be used; use strncat instead") char* strcat(char* dest,
const char* src);
/* Concatenates at most max bytes of the string src into dest. */
char* strncat(char* dest, const char* src, size_t max);

2
libs/libc/include/unistd.h
View File

@ -25,7 +25,7 @@ extern "C"
pid_t fork(void);
/* Terminates the program with the status code status. */
noreturn void _exit(int status);
__lc_noreturn void _exit(int status);
/* Calls the kernel for a specific service, determined by number. */
long syscall(long number, ...);

2
libs/libc/src/atexit.cpp
View File

@ -17,7 +17,7 @@ extern "C"
return 0;
}
noreturn void exit(int status)
__lc_noreturn void exit(int status)
{
for (int i = 0; i < atexit_function_count; i++) { atexit_functions[i](); }
_exit(status);

2
libs/libc/src/luna.cpp
View File

@ -17,7 +17,7 @@ extern "C"
return (unsigned int)syscall(SYS_sleep, ms);
}
noreturn void __luna_abort(const char* message)
__lc_noreturn void __luna_abort(const char* message)
{
fputs(message, stderr);
abort();

2
libs/libc/src/stdlib.cpp
View File

@ -5,7 +5,7 @@
extern "C"
{
noreturn void abort()
__lc_noreturn void abort()
{
_exit(-1);
}

2
libs/libc/src/unistd.cpp
View File

@ -96,7 +96,7 @@ extern "C"
return syscall(SYS_seek, fd, offset, whence);
}
noreturn void _exit(int status)
__lc_noreturn void _exit(int status)
{
syscall(SYS_exit, status);
__builtin_unreachable();