fuck

ish-app · Dec 23, 2019 · 522736d · 522736d
1 parent 3e33c60
commit 522736d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;
 }