Compare commits
2 Commits
c6d91c89cd
...
105ed79f8f
Author | SHA1 | Date | |
---|---|---|---|
105ed79f8f | |||
905e71527e |
@ -15,3 +15,7 @@
|
|||||||
# control characters, leading/trailing spaces, problematic characters and invalid UTF-8). Keep in mind that this restriction
|
# control characters, leading/trailing spaces, problematic characters and invalid UTF-8). Keep in mind that this restriction
|
||||||
# is only enforced when creating files; existing files with such illegal filenames are parsed correctly and fully usable.
|
# is only enforced when creating files; existing files with such illegal filenames are parsed correctly and fully usable.
|
||||||
# target_compile_definitions(moon PRIVATE MOON_DISABLE_FILENAME_RESTRICTIONS)
|
# target_compile_definitions(moon PRIVATE MOON_DISABLE_FILENAME_RESTRICTIONS)
|
||||||
|
|
||||||
|
# Uncomment the line below to make the kernel also calculate stack traces for userspace addresses on program crashes.
|
||||||
|
# This can aid in debugging, but makes the kernel more unstable as stack tracing will access arbitrary userspace memory.
|
||||||
|
# target_compile_definitions(moon PRIVATE MOON_ENABLE_USERSPACE_STACK_TRACES)
|
||||||
|
@ -326,7 +326,10 @@ namespace CPU
|
|||||||
static void backtrace_impl(u64 base_pointer, void (*callback)(u64, void*), void* arg)
|
static void backtrace_impl(u64 base_pointer, void (*callback)(u64, void*), void* arg)
|
||||||
{
|
{
|
||||||
StackFrame* current_frame = (StackFrame*)base_pointer;
|
StackFrame* current_frame = (StackFrame*)base_pointer;
|
||||||
while (current_frame && (u64)current_frame >= 0xFFFF'FFFF'8000'0000 &&
|
while (current_frame &&
|
||||||
|
#ifndef MOON_ENABLE_USERSPACE_STACK_TRACES
|
||||||
|
(u64)current_frame >= 0xFFFF'FFFF'8000'0000 &&
|
||||||
|
#endif
|
||||||
MemoryManager::validate_access(current_frame, sizeof(*current_frame), MemoryManager::DEFAULT_ACCESS) &&
|
MemoryManager::validate_access(current_frame, sizeof(*current_frame), MemoryManager::DEFAULT_ACCESS) &&
|
||||||
current_frame->instruction)
|
current_frame->instruction)
|
||||||
{
|
{
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
#include <bits/fixed-size-types.h>
|
#include <bits/fixed-size-types.h>
|
||||||
#include <bits/platform.h>
|
#include <bits/platform.h>
|
||||||
|
#include <bits/signal.h>
|
||||||
|
|
||||||
#ifndef _SETJMP_H
|
#ifndef _SETJMP_H
|
||||||
#error "Never use bits/setjmp-types.h directly; include setjmp.h instead."
|
#error "Never use bits/setjmp-types.h directly; include setjmp.h instead."
|
||||||
@ -12,7 +13,13 @@
|
|||||||
|
|
||||||
#ifdef __libc_arch_x86_64
|
#ifdef __libc_arch_x86_64
|
||||||
typedef __u64_t jmp_buf[8];
|
typedef __u64_t jmp_buf[8];
|
||||||
typedef __u64_t sigjmp_buf[8];
|
typedef struct
|
||||||
|
{
|
||||||
|
jmp_buf buf;
|
||||||
|
sigset_t set;
|
||||||
|
int saved;
|
||||||
|
} __sigjmp_buf_tag;
|
||||||
|
typedef __sigjmp_buf_tag sigjmp_buf[1];
|
||||||
#else
|
#else
|
||||||
#error "Unsupported architecture."
|
#error "Unsupported architecture."
|
||||||
#endif
|
#endif
|
||||||
|
@ -14,13 +14,13 @@ extern "C"
|
|||||||
/* Saves the current execution state in env. */
|
/* Saves the current execution state in env. */
|
||||||
int setjmp(jmp_buf env);
|
int setjmp(jmp_buf env);
|
||||||
|
|
||||||
/* Right now, does the exact same thing as setjmp() (savesigs is ignored), since signals are not implemented. */
|
/* Saves the current execution state (and optionally, the current signal mask) in env. */
|
||||||
int sigsetjmp(sigjmp_buf env, int savesigs);
|
int sigsetjmp(sigjmp_buf env, int savesigs);
|
||||||
|
|
||||||
/* Restores the execution state saved in env by a setjmp() call. */
|
/* Restores the execution state saved in env by a setjmp() call. */
|
||||||
__noreturn void longjmp(jmp_buf env, int val);
|
__noreturn void longjmp(jmp_buf env, int val);
|
||||||
|
|
||||||
/* Right now, does the exact same as longjmp(), since signals are not implemented. */
|
/* Restores the execution state saved in env by a sigsetjmp() call. */
|
||||||
__noreturn void siglongjmp(sigjmp_buf env, int val);
|
__noreturn void siglongjmp(sigjmp_buf env, int val);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -1,14 +1,17 @@
|
|||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
int sigsetjmp(sigjmp_buf env, int)
|
int sigsetjmp(sigjmp_buf env, int savesigs)
|
||||||
{
|
{
|
||||||
return setjmp(env);
|
if (savesigs) env->saved = 1, sigprocmask(0, nullptr, &env->set);
|
||||||
|
return setjmp(env->buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
__noreturn void siglongjmp(sigjmp_buf env, int val)
|
__noreturn void siglongjmp(sigjmp_buf env, int val)
|
||||||
{
|
{
|
||||||
longjmp(env, val);
|
if (env->saved) sigprocmask(SIG_SETMASK, &env->set, nullptr);
|
||||||
|
longjmp(env->buf, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user