mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-06 03:08:31 +00:00
Make improvements
- Fix build flakes - Polyfill SIGWINCH on Windows - Fix an execve issue on Windows - Make strerror show more information - Improve cmd.exe setup/teardown on Windows - Support bracketed paste mode in Blinkenlights - Show keyboard shortcuts in Blinkenlights status bar - Fixed copy_file_range() and copyfile() w/ zip filesystem - Size optimize GetDosArgv() to keep life.com 12kb in size - Improve Blinkenlights ability to load weird ELF executables - Fix program_executable_name and add GetInterpreterExecutableName - Make Python in tiny mode fail better if docstrings are requested - Update Python test exclusions in tiny* modes such as tinylinux - Add bulletproof unbreakable kprintf() troubleshooting function - Remove "oldskool" keyword from ape.S for virus scanners - Fix issue that caused backtraces to not print sometimes - Improve Blinkenlights serial uart character i/o - Make clock_gettime() not clobber errno on xnu - Improve sha256 cpuid check for old computers - Integrate some bestline linenoise fixes - Show runit process names better in htop - Remove SIGPIPE from ShowCrashReports() - Make realpath() not clobber errno - Avoid attaching GDB on non-Linux - Improve img.com example
This commit is contained in:
Justine Tunney
parent
2a938b3eaa
commit
b45d50b690
194 changed files with 4881 additions and 2966 deletions
|
|
@ -19,6 +19,7 @@
|
|||
#include "libc/bits/bits.h"
|
||||
#include "libc/bits/weaken.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/calls/internal.h"
|
||||
#include "libc/calls/sigbits.h"
|
||||
#include "libc/calls/struct/sigaction.h"
|
||||
#include "libc/calls/struct/siginfo.h"
|
||||
|
|
@ -30,6 +31,7 @@
|
|||
#include "libc/errno.h"
|
||||
#include "libc/fmt/fmt.h"
|
||||
#include "libc/intrin/asan.internal.h"
|
||||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/log/backtrace.internal.h"
|
||||
#include "libc/log/color.internal.h"
|
||||
#include "libc/log/gdb.h"
|
||||
|
|
@ -59,6 +61,8 @@
|
|||
* @see libc/onkill.c
|
||||
*/
|
||||
|
||||
STATIC_YOINK("strerror_r");
|
||||
|
||||
static const char kGregOrder[17] forcealign(1) = {
|
||||
13, 11, 8, 14, 12, 9, 10, 15, 16, 0, 1, 2, 3, 4, 5, 6, 7,
|
||||
};
|
||||
|
|
@ -72,9 +76,9 @@ static const char kCpuFlags[12] forcealign(1) = "CVPRAKZSTIDO";
|
|||
static const char kFpuExceptions[6] forcealign(1) = "IDZOUP";
|
||||
|
||||
/* <SYNC-LIST>: showcrashreports.c, oncrashthunks.S, oncrash.c */
|
||||
int kCrashSigs[8];
|
||||
struct sigaction g_oldcrashacts[8];
|
||||
static const char kCrashSigNames[8][5] forcealign(1) = {
|
||||
int kCrashSigs[7];
|
||||
struct sigaction g_oldcrashacts[7];
|
||||
static const char kCrashSigNames[7][5] forcealign(1) = {
|
||||
"QUIT", //
|
||||
"FPE", //
|
||||
"ILL", //
|
||||
|
|
@ -82,11 +86,10 @@ static const char kCrashSigNames[8][5] forcealign(1) = {
|
|||
"TRAP", //
|
||||
"ABRT", //
|
||||
"BUS", //
|
||||
"PIPE", //
|
||||
};
|
||||
/* </SYNC-LIST>: showcrashreports.c, oncrashthunks.S, oncrash.c */
|
||||
|
||||
relegated static const char *TinyStrSignal(int sig) {
|
||||
static relegated noasan noinstrument const char *TinyStrSignal(int sig) {
|
||||
size_t i;
|
||||
for (i = 0; i < ARRAYLEN(kCrashSigs); ++i) {
|
||||
if (kCrashSigs[i] && sig == kCrashSigs[i]) {
|
||||
|
|
@ -100,14 +103,15 @@ relegated static void ShowFunctionCalls(ucontext_t *ctx) {
|
|||
struct StackFrame *bp;
|
||||
struct StackFrame goodframe;
|
||||
if (!ctx->uc_mcontext.rip) {
|
||||
__printf("%s is NULL can't show backtrace\n", "RIP");
|
||||
kprintf("%s is NULL can't show backtrace%n", "RIP");
|
||||
} else if (!ctx->uc_mcontext.rbp) {
|
||||
__printf("%s is NULL can't show backtrace\n", "RBP");
|
||||
kprintf("%s is NULL can't show backtrace%n", "RBP");
|
||||
} else {
|
||||
goodframe.next = (struct StackFrame *)ctx->uc_mcontext.rbp;
|
||||
goodframe.addr = ctx->uc_mcontext.rip;
|
||||
bp = &goodframe;
|
||||
ShowBacktrace(2, bp);
|
||||
kprintf("%n");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -153,7 +157,7 @@ relegated static void ShowGeneralRegisters(ucontext_t *ctx) {
|
|||
long double st;
|
||||
char *p, buf[128];
|
||||
p = buf;
|
||||
*p++ = '\n';
|
||||
printf("%n");
|
||||
for (i = 0, j = 0, k = 0; i < ARRAYLEN(kGregNames); ++i) {
|
||||
if (j > 0) *p++ = ' ';
|
||||
if (!(s = kGregNames[(unsigned)kGregOrder[i]])[2]) *p++ = ' ';
|
||||
|
|
@ -172,9 +176,9 @@ relegated static void ShowGeneralRegisters(ucontext_t *ctx) {
|
|||
x = st * 1000;
|
||||
if (x < 0) x = -x, *p++ = '-';
|
||||
p = __uintcpy(p, x / 1000), *p++ = '.';
|
||||
p = __uintcpy(p, x % 1000), *p++ = '\n';
|
||||
p = __uintcpy(p, x % 1000);
|
||||
*p = 0;
|
||||
__printf("%s", buf);
|
||||
kprintf("%s%n", buf);
|
||||
p = buf;
|
||||
}
|
||||
}
|
||||
|
|
@ -182,14 +186,14 @@ relegated static void ShowGeneralRegisters(ucontext_t *ctx) {
|
|||
p, ctx->uc_mcontext.gregs[REG_EFL],
|
||||
ctx->uc_mcontext.fpregs ? ctx->uc_mcontext.fpregs->swd : 0,
|
||||
ctx->uc_mcontext.fpregs ? ctx->uc_mcontext.fpregs->mxcsr : 0);
|
||||
__printf("%s\n", buf);
|
||||
kprintf("%s%n", buf);
|
||||
}
|
||||
|
||||
relegated static void ShowSseRegisters(ucontext_t *ctx) {
|
||||
size_t i;
|
||||
char *p, buf[128];
|
||||
if (ctx->uc_mcontext.fpregs) {
|
||||
__printf("\n");
|
||||
kprintf("%n");
|
||||
for (i = 0; i < 8; ++i) {
|
||||
p = buf;
|
||||
if (i >= 10) {
|
||||
|
|
@ -214,7 +218,7 @@ relegated static void ShowSseRegisters(ucontext_t *ctx) {
|
|||
p = __fixcpy(p, ctx->uc_mcontext.fpregs->xmm[i + 8].u64[1], 64);
|
||||
p = __fixcpy(p, ctx->uc_mcontext.fpregs->xmm[i + 8].u64[0], 64);
|
||||
*p = 0;
|
||||
__printf("XMM%s\n", buf);
|
||||
kprintf("XMM%s%n", buf);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -226,48 +230,49 @@ relegated void ShowCrashReport(int err, int sig, struct siginfo *si,
|
|||
int i;
|
||||
char *p;
|
||||
char host[64];
|
||||
intptr_t stackaddr;
|
||||
struct utsname names;
|
||||
static char buf[4096];
|
||||
if (weaken(ShowCrashReportHook)) {
|
||||
ShowCrashReportHook(2, err, sig, si, ctx);
|
||||
}
|
||||
names.sysname[0] = 0;
|
||||
names.release[0] = 0;
|
||||
names.version[0] = 0;
|
||||
names.nodename[0] = 0;
|
||||
__stpcpy(host, "unknown");
|
||||
gethostname(host, sizeof(host));
|
||||
uname(&names);
|
||||
p = buf;
|
||||
__printf("\n%serror%s: Uncaught SIG%s",
|
||||
!g_isterminalinarticulate ? "\e[30;101m" : "",
|
||||
!g_isterminalinarticulate ? "\e[0m" : "", TinyStrSignal(sig));
|
||||
stackaddr = GetStackAddr(0);
|
||||
if (ctx && (ctx->uc_mcontext.rsp >= GetStaticStackAddr(0) &&
|
||||
ctx->uc_mcontext.rsp <= GetStaticStackAddr(0) + PAGESIZE)) {
|
||||
__printf(" (Stack Overflow)");
|
||||
} else if (si) {
|
||||
__printf(" (%s)", GetSiCodeName(sig, si->si_code));
|
||||
}
|
||||
__printf(" on %s pid %d\n %s\n %s\n", host, __getpid(),
|
||||
program_invocation_name, strerror(err));
|
||||
if (uname(&names) != -1) {
|
||||
__printf(" %s %s %s %s\n", names.sysname, names.nodename, names.release,
|
||||
names.version);
|
||||
}
|
||||
errno = err;
|
||||
kprintf("%n%serror%s: Uncaught SIG%s (%s) on %s pid %d%n"
|
||||
" %s%n"
|
||||
" %m%n"
|
||||
" %s %s %s %s%n",
|
||||
!g_isterminalinarticulate ? "\e[30;101m" : "",
|
||||
!g_isterminalinarticulate ? "\e[0m" : "", TinyStrSignal(sig),
|
||||
(ctx && (ctx->uc_mcontext.rsp >= GetStaticStackAddr(0) &&
|
||||
ctx->uc_mcontext.rsp <= GetStaticStackAddr(0) + PAGESIZE))
|
||||
? "Stack Overflow"
|
||||
: GetSiCodeName(sig, si->si_code),
|
||||
host, __getpid(), program_invocation_name, names.sysname,
|
||||
names.nodename, names.release, names.version);
|
||||
if (ctx) {
|
||||
__printf("\n");
|
||||
kprintf("%n");
|
||||
ShowFunctionCalls(ctx);
|
||||
ShowGeneralRegisters(ctx);
|
||||
ShowSseRegisters(ctx);
|
||||
}
|
||||
__printf("\n");
|
||||
kprintf("%n");
|
||||
PrintMemoryIntervals(2, &_mmi);
|
||||
/* PrintSystemMappings(2); */
|
||||
if (__argv) {
|
||||
for (i = 0; i < __argc; ++i) {
|
||||
if (!__argv[i]) continue;
|
||||
if (IsAsan() && !__asan_is_valid(__argv[i], 1)) continue;
|
||||
__printf("%s ", __argv[i]);
|
||||
kprintf("%s ", __argv[i]);
|
||||
}
|
||||
}
|
||||
__printf("\n");
|
||||
kprintf("%n");
|
||||
}
|
||||
|
||||
relegated static void RestoreDefaultCrashSignalHandlers(void) {
|
||||
|
|
@ -280,6 +285,21 @@ relegated static void RestoreDefaultCrashSignalHandlers(void) {
|
|||
}
|
||||
}
|
||||
|
||||
static wontreturn noasan relegated noinstrument void __minicrash(
|
||||
int sig, struct siginfo *si, ucontext_t *ctx, const char *kind) {
|
||||
kprintf("%n"
|
||||
"%n"
|
||||
"CRASHED %s WITH SIG%s%n"
|
||||
"%s%n"
|
||||
"RIP %x%n"
|
||||
"RSP %x%n"
|
||||
"RBP %x%n"
|
||||
"%n",
|
||||
kind, TinyStrSignal(sig), __argv[0], ctx ? ctx->uc_mcontext.rip : 0,
|
||||
ctx ? ctx->uc_mcontext.rsp : 0, ctx ? ctx->uc_mcontext.rbp : 0);
|
||||
quick_exit(119);
|
||||
}
|
||||
|
||||
/**
|
||||
* Crashes in a developer-friendly human-centric way.
|
||||
*
|
||||
|
|
@ -293,48 +313,47 @@ relegated static void RestoreDefaultCrashSignalHandlers(void) {
|
|||
*
|
||||
* This function never returns, except for traps w/ human supervision.
|
||||
*/
|
||||
noasan relegated void __oncrash(int sig, struct siginfo *si, ucontext_t *ctx) {
|
||||
noasan relegated noinstrument void __oncrash(int sig, struct siginfo *si,
|
||||
ucontext_t *ctx) {
|
||||
intptr_t rip;
|
||||
int gdbpid, err;
|
||||
static bool noreentry, notpossible;
|
||||
++g_ftrace;
|
||||
rip = ctx ? ctx->uc_mcontext.rip : 0;
|
||||
--g_ftrace;
|
||||
if (cmpxchg(&noreentry, false, true)) {
|
||||
err = errno;
|
||||
if ((gdbpid = IsDebuggerPresent(true))) {
|
||||
DebugBreak();
|
||||
} else if (g_isterminalinarticulate || g_isrunningundermake) {
|
||||
gdbpid = -1;
|
||||
} else if (FindDebugBinary()) {
|
||||
RestoreDefaultCrashSignalHandlers();
|
||||
gdbpid =
|
||||
attachdebugger(((sig == SIGTRAP || sig == SIGQUIT) &&
|
||||
(rip >= (intptr_t)&_base && rip < (intptr_t)&_etext))
|
||||
? rip
|
||||
: 0);
|
||||
}
|
||||
if (!(gdbpid > 0 && (sig == SIGTRAP || sig == SIGQUIT))) {
|
||||
__restore_tty(1);
|
||||
ShowCrashReport(err, sig, si, ctx);
|
||||
_Exit(128 + sig);
|
||||
if (!__vforked) {
|
||||
rip = ctx ? ctx->uc_mcontext.rip : 0;
|
||||
err = errno;
|
||||
if ((gdbpid = IsDebuggerPresent(true))) {
|
||||
DebugBreak();
|
||||
} else if (g_isterminalinarticulate || g_isrunningundermake) {
|
||||
gdbpid = -1;
|
||||
} else if (IsLinux() && FindDebugBinary()) {
|
||||
RestoreDefaultCrashSignalHandlers();
|
||||
gdbpid = AttachDebugger(
|
||||
((sig == SIGTRAP || sig == SIGQUIT) &&
|
||||
(rip >= (intptr_t)&_base && rip < (intptr_t)&_etext))
|
||||
? rip
|
||||
: 0);
|
||||
}
|
||||
if (!(gdbpid > 0 && (sig == SIGTRAP || sig == SIGQUIT))) {
|
||||
__restore_tty(1);
|
||||
ShowCrashReport(err, sig, si, ctx);
|
||||
quick_exit(128 + sig);
|
||||
}
|
||||
} else {
|
||||
__minicrash(sig, si, ctx, "WHILE VFORKED");
|
||||
}
|
||||
} else if (sig == SIGTRAP) {
|
||||
/* chances are IsDebuggerPresent() confused strace w/ gdb */
|
||||
++g_ftrace;
|
||||
return;
|
||||
} else if (cmpxchg(¬possible, false, true)) {
|
||||
__printf("\n"
|
||||
"\n"
|
||||
"CRASHED WHILE CRASHING WITH SIG%s\n"
|
||||
"%s\n"
|
||||
"RIP %x\n"
|
||||
"RSP %x\n"
|
||||
"RBP %x\n"
|
||||
"\n",
|
||||
TinyStrSignal(sig), __argv[0], rip, ctx ? ctx->uc_mcontext.rsp : 0,
|
||||
ctx ? ctx->uc_mcontext.rbp : 0);
|
||||
_Exit(119);
|
||||
__minicrash(sig, si, ctx, "WHILE CRASHING");
|
||||
} else {
|
||||
for (;;) {
|
||||
asm("ud2");
|
||||
}
|
||||
}
|
||||
noreentry = false;
|
||||
--g_ftrace;
|
||||
++g_ftrace;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue