From 522736d14390394f220c303546f9081958063354 Mon Sep 17 00:00:00 2001 From: Theodore Dubois Date: Sun, 22 Dec 2019 16:39:48 -0800 Subject: [PATCH] fuck --- iSH.xcodeproj/project.pbxproj | 4 ++-- kernel/calls.c | 2 +- kernel/futex.c | 2 ++ kernel/time.c | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/iSH.xcodeproj/project.pbxproj b/iSH.xcodeproj/project.pbxproj index ef16f9f20c..b32cea3377 100644 --- a/iSH.xcodeproj/project.pbxproj +++ b/iSH.xcodeproj/project.pbxproj @@ -1294,7 +1294,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - ISH_LOG = ""; + ISH_LOG = "verbose strace"; MESON_BUILD_DIR = "$(CONFIGURATION_BUILD_DIR)/meson"; ONLY_ACTIVE_ARCH = YES; PRODUCT_APP_GROUP_IDENTIFIER = "group.$(ROOT_BUNDLE_IDENTIFIER)"; @@ -1339,7 +1339,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - ISH_LOG = ""; + ISH_LOG = "verbose strace"; MESON_BUILD_DIR = "$(CONFIGURATION_BUILD_DIR)/meson"; PRODUCT_APP_GROUP_IDENTIFIER = "group.$(ROOT_BUNDLE_IDENTIFIER)"; PRODUCT_BUNDLE_IDENTIFIER = "$(ROOT_BUNDLE_IDENTIFIER)"; diff --git a/kernel/calls.c b/kernel/calls.c index 027c9b57f6..7d43f39be6 100644 --- a/kernel/calls.c +++ b/kernel/calls.c @@ -274,7 +274,7 @@ void handle_interrupt(int interrupt) { void dump_stack() { printk("stack at %x, base at %x, ip at %x\n", current->cpu.esp, current->cpu.ebp, current->cpu.eip); - for (int i = 0; i < 64; i++) { + for (int i = 0; i < 128; i++) { dword_t stackword; if (user_get(current->cpu.esp + (i * 4), stackword)) break; diff --git a/kernel/futex.c b/kernel/futex.c index 4711f80b85..1554a07a13 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -66,6 +66,8 @@ static int futex_load(struct futex *futex, dword_t *out) { } int futex_wait(addr_t uaddr, dword_t val, struct timespec *timeout) { + void dump_stack(); + dump_stack(); struct futex *futex = futex_get(uaddr); int err = 0; dword_t tmp; diff --git a/kernel/time.c b/kernel/time.c index ef1185a860..50ac3cc833 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -48,6 +48,7 @@ dword_t sys_clock_gettime(dword_t clock, addr_t tp) { t.nsec = ts.tv_nsec; if (user_put(tp, t)) return _EFAULT; + STRACE(" {%lds %ldns}", t.sec, t.nsec); return 0; }