mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-01 00:38:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix build breakage in MODE=dbg

Browse source
This commit is contained in:
Justine Tunney 2022-06-15 19:13:47 -07:00
parent e466dd0553
commit fae2a17d2c
6 changed files with 57 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libc/zipos/open.c
View file

@ -47,14 +47,15 @@
static volatile size_t maptotal;
static pureconst size_t __zipos_granularity(void) {
return (IsWindows() ? FRAMESIZE : PAGESIZE) * (IsAsan() ? 8 : 1);
return FRAMESIZE * (IsAsan() ? 8 : 1);
}
static void *__zipos_mmap(size_t mapsize) {
size_t offset;
int prot, flags;
struct DirectMap dm;
uint64_t addr, addr2;
int rc, prot, flags;
uint64_t addr, addr2, addr3;
assert(mapsize);
do offset = maptotal;
while (!_cmpxchg(&maptotal, offset, maptotal + mapsize));
if (offset + mapsize <= kMemtrackZiposSize) {
@ -63,14 +64,21 @@ static void *__zipos_mmap(size_t mapsize) {
addr = kMemtrackZiposStart + offset;
if ((dm = sys_mmap((void *)addr, mapsize, prot, flags, -1, 0)).addr !=
MAP_FAILED) {
TrackMemoryInterval(&_mmi, addr >> 16, (addr + mapsize - 1) >> 16,
dm.maphandle, prot, flags, false, false, 0, mapsize);
rc = TrackMemoryInterval(&_mmi, addr >> 16, (addr + mapsize - 1) >> 16,
dm.maphandle, prot, flags, false, false, 0,
mapsize);
assert(!rc);
if (IsAsan()) {
addr2 = (addr >> 3) + 0x7fff8000;
addr3 = ((addr + mapsize) >> 3) + 0x7fff8000;
assert(!(addr2 & (FRAMESIZE - 1)));
assert(!(addr3 & (FRAMESIZE - 1)));
dm = sys_mmap((void *)addr2, mapsize >> 3, prot, flags, -1, 0);
TrackMemoryInterval(&_mmi, addr2 >> 16,
(addr2 + (mapsize >> 3) - 1) >> 16, dm.maphandle,
prot, flags, false, false, 0, mapsize >> 3);
assert(dm.addr != MAP_FAILED);
rc = TrackMemoryInterval(&_mmi, addr2 >> 16, (addr3 >> 16) - 1,
dm.maphandle, prot, flags, false, false, 0,
mapsize >> 3);
assert(!rc);
}
return (void *)addr;
}