mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-30 16:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rewrite .zip.o file linker

Browse source 
This change takes an entirely new approach to the incremental linking of
pkzip executables. The assets created by zipobj.com are now treated like
debug data. After a .com.dbg is compiled, fixupobj.com should be run, so
it can apply fixups to the offsets and move the zip directory to the end
of the file. Since debug data doesn't get objcopy'd, a new tool has been
introduced called zipcopy.com which should be run after objcopy whenever
a .com file is created. This is all automated by the `cosmocc` toolchain
which is rapidly becoming the new recommended approach.

This change also introduces the new C23 checked arithmetic macros.
This commit is contained in:
Justine Tunney 2023-06-10 09:15:19 -07:00
parent f6407d5f7c
commit 8ff48201ca
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
125 changed files with 1056 additions and 928 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libc/runtime/mmap.c
View file

@ -43,6 +43,7 @@
#include "libc/runtime/internal.h"
#include "libc/runtime/memtrack.internal.h"
#include "libc/runtime/runtime.h"
#include "libc/stdckdint.h"
#include "libc/stdio/rand.h"
#include "libc/str/str.h"
#include "libc/sysv/consts/map.h"
@ -99,9 +100,9 @@ static noasan bool ChooseMemoryInterval(int x, int n, int align, int *res) {
if (i < _mmi.i) {
// check to see if there's space available before the first entry
if (!__builtin_add_overflow(x, align - 1, &start)) {
if (!ckd_add(&start, x, align - 1)) {
start &= -align;
if (!__builtin_add_overflow(start, n - 1, &end)) {
if (!ckd_add(&end, start, n - 1)) {
if (end < _mmi.p[i].x) {
*res = start;
return true;
@ -111,10 +112,10 @@ static noasan bool ChooseMemoryInterval(int x, int n, int align, int *res) {
// check to see if there's space available between two entries
while (++i < _mmi.i) {
if (!__builtin_add_overflow(_mmi.p[i - 1].y, 1, &start) &&
!__builtin_add_overflow(start, align - 1, &start)) {
if (!ckd_add(&start, _mmi.p[i - 1].y, 1) &&
!ckd_add(&start, start, align - 1)) {
start &= -align;
if (!__builtin_add_overflow(start, n - 1, &end)) {
if (!ckd_add(&end, start, n - 1)) {
if (end < _mmi.p[i].x) {
*res = start;
return true;
@ -125,10 +126,10 @@ static noasan bool ChooseMemoryInterval(int x, int n, int align, int *res) {
}
// otherwise append after the last entry if space is available
if (!__builtin_add_overflow(_mmi.p[i - 1].y, 1, &start) &&
!__builtin_add_overflow(start, align - 1, &start)) {
if (!ckd_add(&start, _mmi.p[i - 1].y, 1) &&
!ckd_add(&start, start, align - 1)) {
start &= -align;
if (!__builtin_add_overflow(start, n - 1, &end)) {
if (!ckd_add(&end, start, n - 1)) {
*res = start;
return true;
}
@ -137,9 +138,9 @@ static noasan bool ChooseMemoryInterval(int x, int n, int align, int *res) {
} else {
// if memtrack is empty, then just assign the requested address
// assuming it doesn't overflow
if (!__builtin_add_overflow(x, align - 1, &start)) {
if (!ckd_add(&start, x, align - 1)) {
start &= -align;
if (!__builtin_add_overflow(start, n - 1, &end)) {
if (!ckd_add(&end, start, n - 1)) {
*res = start;
return true;
}
@ -293,8 +294,7 @@ noasan inline void *_Mmap(void *addr, size_t size, int prot, int flags, int fd,
}
if (__virtualmax < LONG_MAX &&
(__builtin_add_overflow((virtualused = GetMemtrackSize(&_mmi)), size,
&virtualneed) ||
(ckd_add(&virtualneed, (virtualused = GetMemtrackSize(&_mmi)), size) ||
virtualneed > __virtualmax)) {
STRACE("mmap %'zu size + %'zu inuse exceeds virtual memory limit %'zu",
size, virtualused, __virtualmax);
@ -308,8 +308,7 @@ noasan inline void *_Mmap(void *addr, size_t size, int prot, int flags, int fd,
return VIP(eexist());
}
if (__builtin_add_overflow((int)(size >> 16), (int)!!(size & (FRAMESIZE - 1)),
&n)) {
if (ckd_add(&n, (int)(size >> 16), (int)!!(size & (FRAMESIZE - 1)))) {
STRACE("mmap range overflows");
return VIP(einval());
}