mirror of
https://github.com/jart/cosmopolitan.git
synced 2024-05-06 05:38:44 +00:00
Fully support old windows 8ib user space virtual memory
Addresses are converted in blocks(asan, automap, stack, ...), with the start and end addresses modified using (address & 0xffffff) | ((address >> 28) << 24). Following addresses are only specified to frame accuracy with the last 4 hex digits chopped off. null, loader, image and arena blocks have not been modified. asan [0x00007fff, 0x10007fff] ⇒ [0x00007fff, 0x01007fff] Not currently supported. automap [0x10008004, 0x1fe7fffb] ⇒ [0x01008004, 0x01e7fffb] _mmi [0x1fe7fffc, 0x1ffffffb] ⇒ [0x01e7fffc, 0x01fffffb] Listed as memtrack outside of the memtrack files. fixedmap [0x30000004, 0x40000003] ⇒ [0x03000004, 0x04000003] nsync [0x6fc00004, 0x6fcffffb] ⇒ [0x06c00004, 0x06cffffb] zipos [0x6fd00004, 0x6fdffffb] ⇒ [0x06d00004, 0x06dffffb] I don't think this is used currently on the vista branch. g_fds [0x6fe00004, 0x6feffffb] ⇒ [0x06e00004, 0x06effffb] winargs [0x6ffffffe, 0x6fffffff] ⇒ [0x06fffffe, 0x06ffffff] Not entirely confident on if this is accurate. stack [0x70000000, 0x70000003] ⇒ [0x07000000, 0x07000003] Not entirely confident on if this is accurate. This map is documented in memtrack64-8tib.txt with the original 128tib version renamed to memtrack64-128tib.txt. Modified windows 8.1 check macro name to match existing windows 10 one. Modified IsShadowFrame to correctly identify the asan block on old windows. Required as the asan block on 128tib virtual memory systems is larger than 2^43 - 1 and so all blocks were reporting as asan.
This commit is contained in:
Joshua Wierenga
Gavin Hayes
parent
8f001857de
commit
fea68b142e
|
|
@ -41,7 +41,8 @@ static volatile size_t mapsize;
|
|||
/**
|
||||
* Grows file descriptor array memory if needed.
|
||||
*
|
||||
* @see libc/runtime/memtrack64.txt
|
||||
* @see libc/runtime/memtrack64-128tib.txt
|
||||
* @see libc/runtime/memtrack64-8tib.txt
|
||||
* @see libc/runtime/memtrack32.txt
|
||||
* @asyncsignalsafe
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ bool32 GetVersionEx(struct NtOsVersionInfo *lpVersionInformation);
|
|||
|
||||
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
|
||||
#define IsAtLeastWindows10() (GetNtMajorVersion() >= 10)
|
||||
#define IsAtleastWindows8p1() \
|
||||
#define IsAtLeastWindows8p1() \
|
||||
(GetNtMajorVersion() > 6 || (GetNtMajorVersion() == 6 && GetNtMinorVersion() == 3))
|
||||
#define GetNtMajorVersion() \
|
||||
({ \
|
||||
|
|
|
|||
|
|
@ -12,24 +12,26 @@
|
|||
#if !(__ASSEMBLER__ + __LINKER__ + 0)
|
||||
COSMOPOLITAN_C_START_
|
||||
|
||||
#define kAutomapStart 0x100080040000
|
||||
#define kAutomapStart _kMemVista(0x100080040000, 0x010080040000)
|
||||
#define kAutomapSize (kMemtrackStart - kAutomapStart)
|
||||
#define kMemtrackStart 0x1fe7fffc0000
|
||||
#define kMemtrackSize (0x1ffffffc0000 - kMemtrackStart)
|
||||
#define kFixedmapStart 0x300000040000
|
||||
#define kFixedmapSize (0x400000040000 - kFixedmapStart)
|
||||
#define kMemtrackFdsStart _kMemVista(0x6fe000040000, 0x5e000040000)
|
||||
#define kMemtrackStart _kMemVista(0x1fe7fffc0000, 0x01e7fffc0000)
|
||||
#define kMemtrackSize \
|
||||
(_kMemVista(0x1ffffffc0000, 0x01fffffc0000) - kMemtrackStart)
|
||||
#define kFixedmapStart _kMemVista(0x300000040000, 0x030000040000)
|
||||
#define kFixedmapSize \
|
||||
(_kMemVista(0x400000040000, 0x040000040000) - kFixedmapStart)
|
||||
#define kMemtrackFdsStart _kMemVista(0x6fe000040000, 0x06e000040000)
|
||||
#define kMemtrackFdsSize \
|
||||
(_kMemVista(0x6feffffc0000, 0x5effffc0000) - kMemtrackFdsStart)
|
||||
#define kMemtrackZiposStart _kMemVista(0x6fd000040000, 0x5d000040000)
|
||||
(_kMemVista(0x6feffffc0000, 0x06effffc0000) - kMemtrackFdsStart)
|
||||
#define kMemtrackZiposStart _kMemVista(0x6fd000040000, 0x06d000040000)
|
||||
#define kMemtrackZiposSize \
|
||||
(_kMemVista(0x6fdffffc0000, 0x5dffffc0000) - kMemtrackZiposStart)
|
||||
#define kMemtrackNsyncStart _kMemVista(0x6fc000040000, 0x5c000040000)
|
||||
(_kMemVista(0x6fdffffc0000, 0x06dffffc0000) - kMemtrackZiposStart)
|
||||
#define kMemtrackNsyncStart _kMemVista(0x6fc000040000, 0x06c000040000)
|
||||
#define kMemtrackNsyncSize \
|
||||
(_kMemVista(0x6fcffffc0000, 0x5cffffc0000) - kMemtrackNsyncStart)
|
||||
(_kMemVista(0x6fcffffc0000, 0x06cffffc0000) - kMemtrackNsyncStart)
|
||||
#define kMemtrackGran (!IsAsan() ? FRAMESIZE : FRAMESIZE * 8)
|
||||
#define _kMemVista(NORMAL, WINVISTA) \
|
||||
(!IsWindows() || IsAtleastWindows8p1() ? NORMAL : WINVISTA)
|
||||
(!IsWindows() || IsAtLeastWindows8p1() ? NORMAL : WINVISTA)
|
||||
|
||||
struct MemoryInterval {
|
||||
int x;
|
||||
|
|
@ -106,7 +108,7 @@ forceinline pureconst bool IsNsyncFrame(int x) {
|
|||
}
|
||||
|
||||
forceinline pureconst bool IsShadowFrame(int x) {
|
||||
return 0x7fff <= x && x < 0x10008000;
|
||||
return 0x7fff <= x && x < _kMemVista(0x10008000, 0x01008000);
|
||||
}
|
||||
|
||||
forceinline pureconst bool IsArenaFrame(int x) {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# -*- conf -*-
|
||||
# Cosmopolitan Libc Memory Plan
|
||||
# Cosmopolitan Libc Memory Plan for modern windows(8.1 and up) and all other supported oses with 128tib user space virtual memory
|
||||
|
||||
00000000-0000001f 2048kb null
|
||||
00000020-0000003f 2048kb loader
|
||||
00000040-00004ffb 1276mb image
|
||||
00005004-00007ffb 768mb arena
|
||||
00007ffe-00007ffe 64kb free
|
||||
00007ffc-00007ffe 192kb free
|
||||
|
||||
# address sanitizer shadow memory
|
||||
00007fff-000fffff 62gb asan
|
||||
|
|
@ -264,7 +264,7 @@
|
|||
0fd00000-0fdfffff 64gb asan
|
||||
0fe00000-0fefffff 64gb asan
|
||||
0ff00000-0fffffff 64gb asan
|
||||
10000000-10008003 2048mb asan
|
||||
10000000-10007fff 2048mb asan
|
||||
|
||||
# memory dedicated to mmap(NULL, ...) automation, e.g. malloc()
|
||||
10008004-100fffff 62gb automap
|
||||
|
|
@ -1811,11 +1811,10 @@
|
|||
6fc00004-6fcffffb 64gb nsync
|
||||
6fd00004-6fdffffb 64gb zipos
|
||||
6fe00004-6feffffb 64gb g_fds
|
||||
6ff00004-70000003 64gb free
|
||||
6ffffffe-6fffffff 128kb winargs
|
||||
|
||||
70000004-70000004 64kb stack
|
||||
70000005-70000006 128kb winargs
|
||||
70000005-700fffff 64gb free
|
||||
70000000-70000003 256kb stack
|
||||
70000004-700fffff 64gb free
|
||||
70100000-701fffff 64gb free
|
||||
70200000-702fffff 64gb free
|
||||
70300000-703fffff 64gb free
|
||||
154
libc/runtime/memtrack64-8tib.txt
Normal file
154
libc/runtime/memtrack64-8tib.txt
Normal file
|
|
@ -0,0 +1,154 @@
|
|||
# -*- conf -*-
|
||||
# Cosmopolitan Libc Memory Plan for old windows(xp through 8.0) 8tib user space virtual memory
|
||||
# Based on regular 128tib version in memtrack64-128tib.txt with each entire region(i.e. asan, mmap and so on are handled as 1024/16384gib blocks not 64gib ones)
|
||||
# is modified using (address & 0xffffff) | ((address >> 28) << 24) and then the interior of region each is updated to match by hand.
|
||||
|
||||
00000000-0000001f 2048kb null
|
||||
00000020-0000003f 2048kb loader
|
||||
00000040-00004ffb 1276mb image
|
||||
00005004-00007ffb 768mb arena
|
||||
00007ffc-00007ffe 192kb free
|
||||
|
||||
# address sanitizer shadow memory
|
||||
00007fff-000fffff 62gb asan
|
||||
00100000-001fffff 64gb asan
|
||||
00200000-002fffff 64gb asan
|
||||
00300000-003fffff 64gb asan
|
||||
00400000-004fffff 64gb asan
|
||||
00500000-005fffff 64gb asan
|
||||
00600000-006fffff 64gb asan
|
||||
00700000-007fffff 64gb asan
|
||||
00800000-008fffff 64gb asan
|
||||
00900000-009fffff 64gb asan
|
||||
00a00000-00afffff 64gb asan
|
||||
00b00000-00bfffff 64gb asan
|
||||
00c00000-00cfffff 64gb asan
|
||||
00d00000-00dfffff 64gb asan
|
||||
00e00000-00efffff 64gb asan
|
||||
00f00000-00ffffff 64gb asan
|
||||
01000000-01007fff 2048mb asan
|
||||
|
||||
# memory dedicated to mmap(NULL, ...) automation, e.g. malloc()
|
||||
01008004-010fffff 62gb automap
|
||||
01100000-011fffff 64gb automap
|
||||
01200000-012fffff 64gb automap
|
||||
01300000-013fffff 64gb automap
|
||||
01400000-014fffff 64gb automap
|
||||
01500000-015fffff 64gb automap
|
||||
01600000-016fffff 64gb automap
|
||||
01700000-017fffff 64gb automap
|
||||
01800000-018fffff 64gb automap
|
||||
01900000-019fffff 64gb automap
|
||||
01a00000-01afffff 64gb automap
|
||||
01b00000-01bfffff 64gb automap
|
||||
01c00000-01cfffff 64gb automap
|
||||
01d00000-01dfffff 64gb automap
|
||||
01e00000-01e7fffb 32gb automap
|
||||
|
||||
01e7fffc-01efffff 32gb _mmi
|
||||
01f00000-01fffffb 64gb _mmi
|
||||
01fffffc-02000003 256kb free
|
||||
|
||||
02000004-020fffff 64gb free
|
||||
02100000-021fffff 64gb free
|
||||
02200000-022fffff 64gb free
|
||||
02300000-023fffff 64gb free
|
||||
02400000-024fffff 64gb free
|
||||
02500000-025fffff 64gb free
|
||||
02600000-026fffff 64gb free
|
||||
02700000-027fffff 64gb free
|
||||
02800000-028fffff 64gb free
|
||||
02900000-029fffff 64gb free
|
||||
02a00000-02afffff 64gb free
|
||||
02b00000-02bfffff 64gb free
|
||||
02c00000-02cfffff 64gb free
|
||||
02d00000-02dfffff 64gb free
|
||||
02e00000-02efffff 64gb free
|
||||
02f00000-03000003 64gb free
|
||||
|
||||
# memory recommended for application MAP_FIXED usage
|
||||
03000004-030fffff 64gb fixedmap
|
||||
03100000-031fffff 64gb fixedmap
|
||||
03200000-032fffff 64gb fixedmap
|
||||
03300000-033fffff 64gb fixedmap
|
||||
03400000-034fffff 64gb fixedmap
|
||||
03500000-035fffff 64gb fixedmap
|
||||
03600000-036fffff 64gb fixedmap
|
||||
03700000-037fffff 64gb fixedmap
|
||||
03800000-038fffff 64gb fixedmap
|
||||
03900000-039fffff 64gb fixedmap
|
||||
03a00000-03afffff 64gb fixedmap
|
||||
03b00000-03bfffff 64gb fixedmap
|
||||
03c00000-03cfffff 64gb fixedmap
|
||||
03d00000-03dfffff 64gb fixedmap
|
||||
03e00000-03efffff 64gb fixedmap
|
||||
03f00000-04000003 64gb fixedmap
|
||||
|
||||
04000004-040fffff 64gb free
|
||||
04100000-041fffff 64gb free
|
||||
04200000-042fffff 64gb free
|
||||
04300000-043fffff 64gb free
|
||||
04400000-044fffff 64gb free
|
||||
04500000-045fffff 64gb free
|
||||
04600000-046fffff 64gb free
|
||||
04700000-047fffff 64gb free
|
||||
04800000-048fffff 64gb free
|
||||
04900000-049fffff 64gb free
|
||||
04a00000-04afffff 64gb free
|
||||
04b00000-04bfffff 64gb free
|
||||
04c00000-04cfffff 64gb free
|
||||
04d00000-04dfffff 64gb free
|
||||
04e00000-04efffff 64gb free
|
||||
04f00000-04ffffff 64gb free
|
||||
|
||||
05000000-050fffff 64gb free
|
||||
05100000-051fffff 64gb free
|
||||
05200000-052fffff 64gb free
|
||||
05300000-053fffff 64gb free
|
||||
05400000-054fffff 64gb free
|
||||
05500000-055fffff 64gb free
|
||||
05600000-056fffff 64gb free
|
||||
05700000-057fffff 64gb free
|
||||
05800000-058fffff 64gb free
|
||||
05900000-059fffff 64gb free
|
||||
05a00000-05afffff 64gb free
|
||||
05b00000-05bfffff 64gb free
|
||||
05c00000-05cfffff 64gb free
|
||||
05d00000-05dfffff 64gb free
|
||||
05e00000-05efffff 64gb free
|
||||
05f00000-05ffffff 64gb free
|
||||
|
||||
06000000-060fffff 64gb free
|
||||
06100000-061fffff 64gb free
|
||||
06200000-062fffff 64gb free
|
||||
06300000-063fffff 64gb free
|
||||
06400000-064fffff 64gb free
|
||||
06500000-065fffff 64gb free
|
||||
06600000-066fffff 64gb free
|
||||
06700000-067fffff 64gb free
|
||||
06800000-068fffff 64gb free
|
||||
06900000-069fffff 64gb free
|
||||
06a00000-06afffff 64gb free
|
||||
06b00000-06bfffff 64gb free
|
||||
06c00004-06cffffb 64gb nsync
|
||||
06d00004-06dffffb 64gb zipos
|
||||
06e00004-06effffb 64gb g_fds
|
||||
06fffffe-06ffffff 128kb winargs
|
||||
|
||||
07000000-07000003 256kb stack
|
||||
07000004-070fffff 64gb free
|
||||
07100000-071fffff 64gb free
|
||||
07200000-072fffff 64gb free
|
||||
07300000-073fffff 64gb free
|
||||
07400000-074fffff 64gb free
|
||||
07500000-075fffff 64gb free
|
||||
07600000-076fffff 64gb free
|
||||
07700000-077fffff 64gb free
|
||||
07800000-078fffff 64gb free
|
||||
07900000-079fffff 64gb free
|
||||
07a00000-07afffff 64gb free
|
||||
07b00000-07bfffff 64gb free
|
||||
07c00000-07cfffff 64gb free
|
||||
07d00000-07dfffff 64gb free
|
||||
07e00000-07efffff 64gb free
|
||||
07f00000-07ffffff 64gb free
|
||||
|
|
@ -107,14 +107,18 @@ extern char ape_stack_align[] __attribute__((__weak__));
|
|||
* problematic, since MODE=tiny doesn't use any of the runtime codes
|
||||
* which want the stack to be cheaply knowable, e.g. ftrace, kprintf
|
||||
*/
|
||||
#define GetStaticStackAddr(ADDEND) \
|
||||
({ \
|
||||
intptr_t vAddr; \
|
||||
__asm__(".weak\tape_stack_vaddr\n\t" \
|
||||
"movabs\t%1+ape_stack_vaddr,%0" \
|
||||
: "=r"(vAddr) \
|
||||
: "i"(ADDEND)); \
|
||||
vAddr; \
|
||||
#define GetStaticStackAddr(ADDEND) \
|
||||
({ \
|
||||
intptr_t vAddr; \
|
||||
if (!IsWindows() || IsAtLeastWindows8p1()) { \
|
||||
__asm__(".weak\tape_stack_vaddr\n\t" \
|
||||
"movabs\t%1+ape_stack_vaddr,%0" \
|
||||
: "=r"(vAddr) \
|
||||
: "i"(ADDEND)); \
|
||||
} else { \
|
||||
vAddr = 0x070000000000 + ADDEND; \
|
||||
} \
|
||||
vAddr; \
|
||||
})
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue