Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit e9490b4
Merge: 99bc216 02b6bd0
Author: Mike Miller <emkey1@gmail.com>
Date:   Sun Oct 30 11:16:27 2022 -0700

    Merge pull request #123 from emkey1/dev

    Merge 1.2.4 Build 429 changes

commit 02b6bd0
Merge: 50eaba1 e73525e
Author: Mike Miller <emkey1@oneopa.com>
Date:   Sun Oct 30 10:08:56 2022 -0700

    Merge branch 'ish-app-master' into dev
    Upstream merge

commit e73525e
Merge: 50eaba1 0c0fa0f
Author: Mike Miller <emkey1@oneopa.com>
Date:   Sun Oct 30 10:08:32 2022 -0700

    Merge branch 'master' of https://github.com/ish-app/ish into ish-app-master

    Merging upstream

commit 50eaba1
Author: Mike Miller <emkey1@oneopa.com>
Date:   Sun Oct 30 10:04:24 2022 -0700

    Fixed elock so that it doesn't crash the app when toggled

commit e98aefd
Author: Mike Miller <emkey1@oneopa.com>
Date:   Sat Oct 29 19:24:27 2022 -0700

    Repurpose the enable_extralocking stuff to enable or disable additional thread coherency code, disable app_nap, preliminary checks to try to figure out if a non musl/Alpine release is running.

commit 0c0fa0f
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Oct 28 06:09:13 2022 +0000

    Bump version to 429

commit 10533be
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Oct 28 00:36:07 2022 +0000

    Update Alpine repositories

commit d79dbcf
Author: Mike Miller <emkey1@oneopa.com>
Date:   Thu Oct 27 16:58:46 2022 -0700

    Remove what little extra locking stuff remained.  It still appears in /proc/ish for backwards compatibility, but does nothing.

commit f578a0a
Author: Mike Miller <emkey1@oneopa.com>
Date:   Thu Oct 27 15:49:34 2022 -0700

    Some cleanup/fixing in regards to lock->comm, plus cleanup and bug fixing of a bogus unlock of &pid_lock that I introduced in August.

commit 5ac825c
Author: Mike Miller <emkey1@oneopa.com>
Date:   Wed Oct 26 19:36:09 2022 -0700

    More tweaks to reduce the odds of processes hanging.  Also disabled sse, as
    it was causing issues with ssl on Alpine.

commit e718794
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Oct 26 06:09:24 2022 +0000

    Bump version to 428

commit 11e8c7f
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Oct 26 00:35:53 2022 +0000

    Update Alpine repositories

commit 2b31cc6
Author: Theodore Dubois <tblodt@icloud.com>
Date:   Tue Oct 25 09:13:09 2022 -0700

    Update linux

commit 062067f
Author: Mike Miller <emkey1@oneopa.com>
Date:   Tue Oct 25 11:26:35 2022 -0700

    Checkpoint, much improved stability due to checking task->pending and not killing stuff when it is set.

commit 568eee3
Merge: 410615e 4daeff3
Author: Mike Miller <emkey1@oneopa.com>
Date:   Mon Oct 24 17:45:31 2022 -0700

    Merge branch 'ish-app-master' into dev
    Merged upstream

commit 4daeff3
Merge: 410615e 074ddee
Author: Mike Miller <emkey1@oneopa.com>
Date:   Mon Oct 24 17:45:04 2022 -0700

    Merge branch 'master' of https://github.com/ish-app/ish into ish-app-master

    Merged upstream changes

commit 074ddee
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Oct 24 06:38:30 2022 +0000

    Bump version to 427

commit 3aacc18
Author: Theodore Dubois <tblodt@icloud.com>
Date:   Sun Oct 23 22:11:08 2022 -0700

    Port emulator poke to arm

commit 0511e42
Merge: b24478a 7be7e0d
Author: tbodt <tblodt@icloud.com>
Date:   Sun Oct 23 19:30:27 2022 -0700

    Merge pull request ish-app#1933 from saagarjha/master

commit 7be7e0d
Author: Saagar Jha <saagar@saagarjha.com>
Date:   Sun Oct 23 18:18:57 2022 -0700

    Replace chatty syscall stubs with silent variant

    These syscalls have fallbacks in musl which we do implement but they are
    only invoked after they return ENOSYS, which fills dmesg with lots of
    spam.

commit b24478a
Author: Theodore Dubois <tblodt@icloud.com>
Date:   Sun Oct 23 17:20:55 2022 -0700

    Allow specifying kconfig for xcode

commit 4d722ed
Merge: 903919e f76e46a
Author: tbodt <tblodt@icloud.com>
Date:   Sun Oct 23 14:28:02 2022 -0700

    Merge pull request ish-app#1926 from jason-conway/i-make-money-movs

commit 903919e
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat Oct 22 06:14:01 2022 +0000

    Bump version to 426

commit 611044e
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat Oct 22 00:39:53 2022 +0000

    Update Alpine repositories

commit c07a1b5
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Oct 21 06:20:33 2022 +0000

    Bump version to 425

commit 19cc084
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Oct 21 00:36:22 2022 +0000

    Update Alpine repositories

commit defd059
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Oct 20 06:14:37 2022 +0000

    Bump version to 424

commit f18a2b0
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Oct 20 00:38:06 2022 +0000

    Update Alpine repositories

commit 5b2fbc8
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Oct 19 06:36:10 2022 +0000

    Bump version to 423

commit 4906b64
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Oct 19 00:40:18 2022 +0000

    Update Alpine repositories

commit 3b82191
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun Oct 16 06:14:06 2022 +0000

    Bump version to 422

commit f76e46a
Author: Jason Conway <jpc@jasonconway.dev>
Date:   Sat Oct 15 20:35:03 2022 -0500

    Update golden file

commit 8146bf6
Author: Jason Conway <jpc@jasonconway.dev>
Date:   Sat Oct 15 20:33:25 2022 -0500

    Expand qemu-test and add tests for new instructions

commit 5bd020b
Author: Jason Conway <jpc@jasonconway.dev>
Date:   Sat Oct 15 20:26:38 2022 -0500

    legalize instructions

    Add mov instructions for packed floating-point values; single-precision min, max, and sqrt; movntq and movntdq

commit 5e5263b
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun Oct 16 00:41:43 2022 +0000

    Update Alpine repositories

commit 410615e
Author: Mike Miller <emkey1@oneopa.com>
Date:   Sat Oct 15 14:54:36 2022 -0700

    Checkpoint, build 321 I think

commit 36e181d
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Oct 11 06:25:17 2022 +0000

    Bump version to 421

commit f365fa8
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Oct 11 00:36:35 2022 +0000

    Update Alpine repositories
  • Loading branch information
@jason-conway
jason-conway committed Oct 30, 2022
1 parent 279613b commit efe6fda
Show file tree
Hide file tree
Showing 23 changed files with 288 additions and 189 deletions.
4 changes: 4 additions & 0 deletions app/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ @interface AppDelegate ()
static void ios_handle_exit(struct task *task, int code) {
// we are interested in init and in children of init
// this is called with pids_lock as an implementation side effect, please do not cite as an example of good API design
if(task->pid > MAX_PID) {// Corruption
printk("ERROR: Insane PID in ios_handle_exit(%d)\n", task->pid);
return;
}
if (task->parent != NULL && task->parent->parent != NULL)
return;
// pid should be saved now since task would be freed
Expand Down
13 changes: 13 additions & 0 deletions app/UserPreferences.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@

#import "UserPreferences.h"
#import "fs/proc/ish.h"
#include "sync.h"
#include "task.h"

// Stuff to allow for cleaning up when doEnableExtraLocking is disabled. -mke
extern bool doEnableExtraLocking;
extern lock_t pids_lock;
extern struct list alive_pids_list;

// IMPORTANT: If you add a constant here and expose it via UserPreferences,
// consider if it also needs to be exposed as a friendly preference and included
Expand Down Expand Up @@ -438,6 +445,12 @@ - (void)setShouldEnableExtraLocking:(BOOL)dim {
}

- (BOOL)validateShouldEnableExtraLocking:(id *)value error:(NSError **)error {
// Should set task->critical_region.count to 0 for all active processes when this is set to false. Otherwise stuff blows up. -mke
if(doEnableExtraLocking == true) { // This needs to be the opposite of what you would expect because of reasons. -mke
complex_lockt(&pids_lock, 0, __FILE__, __LINE__);
dword_t res = zero_critical_regions_count();
unlock(&pids_lock);
}
return [*value isKindOfClass:NSNumber.class];
}

Expand Down
11 changes: 11 additions & 0 deletions app/main.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,20 @@
#import <UIKit/UIKit.h>
#import "AppDelegate.h"
extern void run_at_boot(void);
#import <Foundation/Foundation.h>
#import <Foundation/NSProcessInfo.h>

void disable_app_nap(void)
{
if ([[NSProcessInfo processInfo] respondsToSelector:@selector(beginActivityWithOptions:reason:)])
{
[[NSProcessInfo processInfo] beginActivityWithOptions:0x00FFFFFF reason:@"Not sleepy and don't want to nap"];
}
}

int main(int argc, char * argv[]) {
@autoreleasepool {
disable_app_nap(); // No napping I say. -mke
run_at_boot();
return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
}
Expand Down
12 changes: 11 additions & 1 deletion emu/cpuid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define CPUID_H

#include "misc.h"
extern bool isGlibC;

static inline void do_cpuid(dword_t *eax, dword_t *ebx, dword_t *ecx, dword_t *edx) {
dword_t leaf = *eax;
Expand All @@ -17,11 +18,20 @@ static inline void do_cpuid(dword_t *eax, dword_t *ebx, dword_t *ecx, dword_t *e
*eax = 0x0; // say nothing about cpu model number
*ebx = 0x0; // processor number 0, flushes 0 bytes on clflush
*ecx = 0; // we support none of the features in ecx
*edx = (1 << 0) // fpu
if(isGlibC) {
*edx = (1 << 0) // fpu
| (1 << 15) // cmov
| (1 << 23) // mmx
| (1 << 25) // sse // musl handles sse being enabled badly. -mke
| (1 << 26) // sse2
;
} else {
*edx = (1 << 0) // fpu
| (1 << 15) // cmov
| (1 << 23) // mmx
| (1 << 26) // sse2
;
}
break;
}
}
Expand Down
7 changes: 0 additions & 7 deletions emu/memory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ void mem_init(struct mem *mem) {
}

void mem_destroy(struct mem *mem) {
//int elock_fail = 0;
// if(doEnableExtraLocking)
// elock_fail = extra_lockf(0);

write_lock(&mem->lock);
while((critical_region_count(current) > 1) && (current->pid > 1) ){ // Wait for now, task is in one or more critical sections, and/or has locks
nanosleep(&lock_pause, NULL);
Expand Down Expand Up @@ -85,9 +81,6 @@ void mem_destroy(struct mem *mem) {

//modify_critical_region_counter(current, -1, __FILE__, __LINE__);

//if((doEnableExtraLocking) && (!elock_fail))
// extra_unlockf(0);

}

#define PGDIR_TOP(page) ((page) >> 10)
Expand Down
47 changes: 2 additions & 45 deletions emu/vec.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#ifdef __ARM_NEON__
#include <arm_neon.h>
#endif
#include <math.h>
#include <string.h>

Expand Down Expand Up @@ -193,15 +190,8 @@ void vec_imm_shiftrs_d128(NO_CPU, const uint8_t amount, union xmm_reg *dst) {
}

void vec_add_b128(NO_CPU, union xmm_reg *src, union xmm_reg *dst) {
#ifdef __ARM_NEON__
uint8x16_t neon_dst = vld1q_u8(dst->u8);
uint8x16_t neon_src = vld1q_u8(src->u8);
uint8x16_t neon_res = vaddq_u8(neon_dst, neon_src);
vst1q_u8(dst->u8, neon_res);
#else
for (unsigned i = 0; i < array_size(src->u8); i++)
dst->u8[i] += src->u8[i];
#endif
}
void vec_add_w128(NO_CPU, union xmm_reg *src, union xmm_reg *dst) {
for (unsigned i = 0; i < array_size(src->u16); i++)
Expand Down Expand Up @@ -332,16 +322,9 @@ void vec_xor64(NO_CPU, union mm_reg *src, union mm_reg *dst) {
}

void vec_min_ub128(NO_CPU, union xmm_reg *src, union xmm_reg *dst) {
#ifdef __ARM_NEON__
uint8x16_t neon_dst = vld1q_u8(dst->u8);
uint8x16_t neon_src = vld1q_u8(src->u8);
uint8x16_t neon_res = vminq_u8(neon_dst, neon_src);
vst1q_u8(dst->u8, neon_res);
#else
for (unsigned i = 0; i < array_size(src->u8); i++)
if (src->u8[i] < dst->u8[i])
dst->u8[i] = src->u8[i];
#endif
}
void vec_max_ub128(NO_CPU, union xmm_reg *src, union xmm_reg *dst) {
for (unsigned i = 0; i < array_size(src->u8); i++)
Expand All @@ -359,7 +342,7 @@ void vec_maxs_w128(NO_CPU, union xmm_reg *src, union xmm_reg *dst) {
}

static bool cmpd(double a, double b, int type) {
bool res = false;
bool res;
switch (type % 4) {
case 0: res = a == b; break;
case 1: res = a < b; break;
Expand All @@ -370,7 +353,7 @@ static bool cmpd(double a, double b, int type) {
return res;
}
static bool cmps(float a, float b, int type) {
bool res = false;
bool res;
switch (type % 4) {
case 0: res = a == b; break;
case 1: res = a < b; break;
Expand Down Expand Up @@ -602,15 +585,8 @@ void vec_shuffle_d128(NO_CPU, const union xmm_reg *src, union xmm_reg *dst, uint
}

void vec_compare_eqb128(NO_CPU, const union xmm_reg *src, union xmm_reg *dst) {
#ifdef __ARM_NEON__
uint8x16_t neon_dst = vld1q_u8(dst->u8);
uint8x16_t neon_src = vld1q_u8(src->u8);
uint8x16_t neon_res = vceqq_u8(neon_dst, neon_src);
vst1q_u8(dst->u8, neon_res);
#else
for (unsigned i = 0; i < array_size(src->u8); i++)
dst->u8[i] = dst->u8[i] == src->u8[i] ? ~0 : 0;
#endif
}
void vec_compare_eqw128(NO_CPU, const union xmm_reg *src, union xmm_reg *dst) {
for (unsigned i = 0; i < array_size(src->u16); i++)
Expand All @@ -621,16 +597,6 @@ void vec_compare_eqd128(NO_CPU, const union xmm_reg *src, union xmm_reg *dst) {
dst->u32[i] = dst->u32[i] == src->u32[i] ? ~0 : 0;
}

/*
* Neon algo: (only one part (64bits) is demonstrated, algo works the same for another part)
* z - is a bit which forms the mask, X - is not interesting bit.
* neon_src: zXXXXXXXzXXXXXXXzXXXXXXXzXXXXXXXzXXXXXXXzXXXXXXXzXXXXXXXzXXXXXXX...
* step1: 0000000z0000000z0000000z0000000z0000000z0000000z0000000z0000000z...
* step2: 00000000000000zz00000000000000zz00000000000000zz00000000000000zz...
* step3: 0000000000000000000000000000zzzz0000000000000000000000000000zzzz...
* step4: 00000000000000000000000000000000000000000000000000000000zzzzzzzz...
* After step4, 8 bits at the end of each 64bit lane are loaded into dst.
*/
void vec_compares_gtb128(NO_CPU, const union xmm_reg *src, union xmm_reg *dst) {
for (unsigned i = 0; i < array_size(src->u8); i++)
dst->u8[i] = (int8_t)dst->u8[i] > (int8_t)src->u8[i] ? ~0 : 0;
Expand All @@ -646,19 +612,10 @@ void vec_compares_gtd128(NO_CPU, const union xmm_reg *src, union xmm_reg *dst) {

void vec_movmask_b128(NO_CPU, const union xmm_reg *src, uint32_t *dst) {
*dst = 0;
#if defined(__ARM_NEON__) && defined(__LITTLE_ENDIAN__)
uint8x16_t neon_src = vld1q_u8(src->u8);
uint16x8_t step1 = vshrq_n_u8(neon_src, 7);
uint32x4_t step2 = vsraq_n_u16(step1, step1, 7);
uint64x2_t step3 = vsraq_n_u32(step2, step2, 14);
uint16x8_t step4 = vsraq_n_u64(step3, step3, 28);
*dst |= (vgetq_lane_u8(step4, 8) << 8) | (vgetq_lane_u8(step4, 0));
#else
for (unsigned i = 0; i < array_size(src->u8); i++) {
if (src->u8[i] & (1 << 7))
*dst |= 1 << i;
}
#endif
}

void vec_fmovmask_d128(NO_CPU, const union xmm_reg *src, uint32_t *dst) {
Expand Down
4 changes: 2 additions & 2 deletions fs/fake.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,10 @@ static void __attribute__((constructor)) init_fake_fdops() {

static int fakefs_mount(struct mount *mount) {
char db_path[PATH_MAX];
strcpy(db_path, mount->source);
strncpy(db_path, mount->source, PATH_MAX -1);
char *basename = strrchr(db_path, '/') + 1;
assert(strcmp(basename, "data") == 0);
strcpy(basename, "meta.db");
strncpy(basename, "meta.db", 8);

// do this now so rebuilding can use root_fd
int err = realfs.mount(mount);
Expand Down
9 changes: 5 additions & 4 deletions fs/proc/ish.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,18 +278,18 @@ static int proc_ish_show_ips(struct proc_entry *UNUSED(entry), struct proc_data
char * int_ip = malloc(100);
char * int_dstaddr = malloc(100);
if(cursor->ifa_addr->sa_family == AF_INET) {
strcpy(type, "IF_INET");
strncpy(type, "IF_INET", 9);
} else {
strcpy(type, "IF_INET6");
strncpy(type, "IF_INET6", 9);
}
//cursor->ifa_addr->sa_family = AF_INET;
get_ip_str(cursor->ifa_addr, int_ip, 100);
char * mac = malloc(100);
if(cursor->ifa_dstaddr != NULL) {
if(cursor->ifa_dstaddr->sa_family == AF_INET) {
strcpy(type, "IF_INET");
strncpy(type, "IF_INET", 9);
} else {
strcpy(type, "IF_INET6");
strncpy(type, "IF_INET6", 9);
cursor->ifa_dstaddr->sa_family = AF_INET6;
}
get_ip_str(cursor->ifa_dstaddr, int_dstaddr, 100);
Expand All @@ -315,6 +315,7 @@ static int proc_ish_show_ips(struct proc_entry *UNUSED(entry), struct proc_data
);
free(int_ip);
free(int_flags);
free(int_dstaddr);
}
cursor = cursor->ifa_next;
}
Expand Down
13 changes: 0 additions & 13 deletions fs/proc/pid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ static int proc_pid_stat_show(struct proc_entry *entry, struct proc_data *buf) {
struct task *task = proc_get_task(entry);
if ((task == NULL) || (task->exiting == true))
return _ESRCH;
//int elock_fail;
// if(doEnableExtraLocking)
// elock_fail = extra_lockf(entry->pid);

////modify_critical_region_counter(task, 1, __FILE__, __LINE__);
lock(&task->general_lock, 0);
Expand Down Expand Up @@ -114,9 +111,6 @@ static int proc_pid_stat_show(struct proc_entry *entry, struct proc_data *buf) {
// that's enough for now
proc_printf(buf, "\n");

//if((doEnableExtraLocking) && (!elock_fail))
// extra_unlockf(entry->pid);

//unlock(&task->sighand->lock);
unlock(&task->group->lock);
unlock(&task->general_lock);
Expand Down Expand Up @@ -175,10 +169,6 @@ static int proc_pid_cmdline_show(struct proc_entry *entry, struct proc_data *buf
int err = 0;
lock(&task->general_lock, 0);

//int elock_fail = 0;
// if(doEnableExtraLocking)
// elock_fail = extra_lockf(task->pid);

if (task->mm == NULL)
goto out_free_task;

Expand All @@ -195,10 +185,7 @@ static int proc_pid_cmdline_show(struct proc_entry *entry, struct proc_data *buf
out_free_task:
unlock(&task->general_lock);
//proc_put_task(task);
////modify_critical_region_counter(task, -1, __FILE__, __LINE__);

//if((doEnableExtraLocking) && (!elock_fail))
// extra_unlockf(task->pid);
return err;
}

Expand Down
32 changes: 32 additions & 0 deletions iSH-AOK.xcodeproj/xcshareddata/xcschemes/iSH.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,38 @@
ReferencedContainer = "container:iSH-AOK.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
<AdditionalOption
key = "MallocStackLogging"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "DYLD_INSERT_LIBRARIES"
value = "/usr/lib/libgmalloc.dylib"
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "PrefersMallocStackLoggingLite"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "NSZombieEnabled"
value = "YES"
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "MallocGuardEdges"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "MallocScribble"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
7 changes: 7 additions & 0 deletions jit/jit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@ struct jit *jit_new(struct mmu *mmu) {
return jit;
}



void jit_free(struct jit *jit) {
bool signal_pending = !!(current->pending & ~current->blocked);
while((critical_region_count(current) > 2) || (locks_held_count(current)) || (current->process_info_being_read) || (signal_pending)) { // Wait for now, task is in one or more critical sections, and/or has locks, or signals in flight
nanosleep(&lock_pause, NULL);
signal_pending = !!(current->pending & ~current->blocked);
}
for (size_t i = 0; i < jit->hash_size; i++) {
struct jit_block *block, *tmp;
if (list_null(&jit->hash[i]))
Expand Down
9 changes: 6 additions & 3 deletions kernel/calls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@
#include "kernel/task.h"
#include "kernel/resource_locking.h"

dword_t syscall_stub() {
extern bool isGlibC;

dword_t syscall_stub(void) {
STRACE("syscall_stub()");
//STRACE("syscall_stub()");
return _ENOSYS;
}
dword_t syscall_stub_silent() {
dword_t syscall_stub_silent(void) {
STRACE("syscall_stub_silent()");
return _ENOSYS;
}
dword_t syscall_success_stub() {
dword_t syscall_success_stub(void) {
STRACE("syscall_stub_success()");
return 0;
}
Expand Down Expand Up @@ -125,6 +127,7 @@ syscall_t syscall_table[] = {
[157] = (syscall_t) sys_sched_getscheduler,
[158] = (syscall_t) sys_sched_yield,
[159] = (syscall_t) sys_sched_get_priority_max,
[160] = (syscall_t) sys_sched_get_priority_min,
[162] = (syscall_t) sys_nanosleep,
[163] = (syscall_t) sys_mremap,
[168] = (syscall_t) sys_poll,
Expand Down
Loading

0 comments on commit efe6fda

Please sign in to comment.