Skip to content

[pull] master from jart:master #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 19, 2024
Merged

[pull] master from jart:master #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d2298b
Fix exec page issues when threads are disabled (#175)
robalb Oct 16, 2024
1fe980c
Fix execstack flags (#176)
robalb Oct 16, 2024
93cc278
Fix GetBitsInAddressSpace (#177)
robalb Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blink/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ static bool LoadElf(struct Machine *m, //
Read16(ehdr->phentsize) * i);
switch (Read32(phdr->type)) {
case PT_GNU_STACK_:
execstack = false;
execstack = Read32(phdr->flags) & PF_X_;
break;
case PT_LOAD_:
end = LoadElfLoadSegment(m, elf->execfn, ehdr, esize, phdr, end, &prot,
Expand Down
4 changes: 4 additions & 0 deletions blink/map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ static void *PortableMmap(void *addr, //
}

static int GetBitsInAddressSpace(void) {
#ifdef __EMSCRIPTEN__
return 32;
#else
int i;
void *ptr;
uint64_t want;
Expand All @@ -117,6 +120,7 @@ static int GetBitsInAddressSpace(void) {
}
}
Abort();
#endif
}

static u64 GetVirtualAddressSpace(int vabits, long pagesize) {
Expand Down
2 changes: 0 additions & 2 deletions blink/memorymalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,6 @@ bool IsValidAddrSize(i64 virt, i64 size) {
}

void InvalidateSystem(struct System *s, bool tlb, bool icache) {
#ifdef HAVE_THREADS
struct Dll *e;
struct Machine *m;
if (tlb || icache) {
Expand All @@ -501,7 +500,6 @@ void InvalidateSystem(struct System *s, bool tlb, bool icache) {
}
UNLOCK(&s->machines_lock);
}
#endif
}

struct FileMap *AddFileMap(struct System *s, i64 virt, i64 size,
Expand Down
Loading