Skip to content
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

Jump to bottom

Map bricks below first 2GB of address space #132

Merged
merged 3 commits into from
Oct 13, 2021
Merged

Map bricks below first 2GB of address space #132

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c27b82
Map bricks below first 2GB of address space
mogery Oct 12, 2021
4ca58d1
Fix incorrect brick cleanup
mogery Oct 12, 2021
bcb0bde
Declare my_mmap and my_munmap to avoid warning
mogery Oct 13, 2021
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
Next Next commit
Map bricks below first 2GB of address space 
This fixes an issue with mono where JIT compiled code would
near-call wrapped libraries, but fail because the difference
between PC and the call address did not fit into an imm32.

This was fixed by replacing posix_memalign with my_mmap and
providing the MAP_32BIT flag.

Fixes #131
  • Loading branch information
@mogery
mogery committed Oct 12, 2021
commit 0c27b82ff3b8a1da27d7ed32e89c90518f9c2c0c
5 changes: 4 additions & 1 deletion src/tools/bridge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <string.h>
#include <dlfcn.h>
#include <pthread.h>
#include <sys/mman.h>

#include "custommem.h"
#include "bridge.h"
Expand Down Expand Up @@ -36,9 +37,11 @@ typedef struct bridge_s {
brick_t* NewBrick()
{
brick_t* ret = (brick_t*)calloc(1, sizeof(brick_t));
if(posix_memalign((void**)&ret->b, box64_pagesize, NBRICK*sizeof(onebridge_t))) {
void* ptr = my_mmap(thread_get_emu(), NULL, NBRICK * sizeof(onebridge_t), PROT_READ | PROT_WRITE, MAP_PRIVATE | 0x40 | MAP_ANONYMOUS, -1, 0); // 0x40 is MAP_32BIT
if(ptr == MAP_FAILED) {
printf_log(LOG_NONE, "Warning, cannot allocate 0x%lx aligned bytes for bridge, will probably crash later\n", NBRICK*sizeof(onebridge_t));
}
ret->b = ptr;
return ret;
}

Expand Down