Skip to content

Commit dcdbcc9

Browse files
authored
Merge pull request #1982 from andrew-johnson-4/lib1-lib2-wip-dfiiiiiiii
Lib1 lib2 wip dfiiiiiiii
2 parents e78aed8 + 21fa839 commit dcdbcc9

7 files changed

Lines changed: 2561 additions & 2662 deletions

File tree

BOOTSTRAP/cli.c

Lines changed: 2558 additions & 2560 deletions
Large diffs are not rendered by default.

lib/std/array.lsts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ let mark-memory-as-safe(ptr: t[], len: U64): Nil = (
4242
while len > 0_u64 {
4343
let ignored = ptr[0_u64];
4444
len = len - 1_u64;
45-
ptr = ((ptr as U8[]) + sizeof(t)) as t[];
45+
ptr = ((ptr as U8[]) + 1) as t[];
4646
};
4747
);
4848

lib/std/default.lsts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ import std/print.lsts;
3434
import std/collections.lsts;
3535
import std/regex.lsts;
3636
import std/phi.lsts;
37-
import std/owned-data.lsts;

lib/std/minimal.lsts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ import std/regex.lsts;
3030
import std/cmp.lsts;
3131
import std/print.lsts;
3232
import std/collections.lsts;
33-
import std/owned-data.lsts;
3433
import std/phi.lsts;

lib/std/owned-data.lsts

Lines changed: 0 additions & 91 deletions
This file was deleted.

lib1/std/array.lsts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let mark-memory-as-safe(ptr: t[], len: USize): Nil = (
2424
while len > 0_sz {
2525
let ignored = ptr[0_sz];
2626
len = len - 1_sz;
27-
ptr = ((ptr as U8[]) + (sizeof(t) as USize)) as t[];
27+
ptr = ((ptr as U8[]) + 1_sz) as t[];
2828
};
2929
);
3030

@@ -68,9 +68,6 @@ let safe-realloc-impl(ptr: ?[], nb: USize): ?[] = (
6868
fail(c"realloc fail");
6969
};
7070

71-
# Zero Out Memory
72-
memset(new-ptr as C<"void">[], 0, nb);
73-
7471
mark-memory-as-safe(new-ptr as U8[], nb);
7572

7673
# TODO: wrap counter adjustments in conditional compilation

lib2/core/array.lsts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let mark-memory-as-safe(ptr: t[], len: USize): Nil = (
2222
while len > 0_sz {
2323
let ignored = ptr[0_sz];
2424
len = len - 1_sz;
25-
ptr = ((ptr as U8[]) + (sizeof(t) as USize)) as t[];
25+
ptr = ((ptr as U8[]) + 1_sz) as t[];
2626
};
2727
);
2828

@@ -66,9 +66,6 @@ let safe-realloc-impl(ptr: ?[], nb: USize): ?[] = (
6666
fail(c"realloc fail");
6767
};
6868

69-
# Zero Out Memory
70-
memset(new-ptr as C<"void">[], 0, nb);
71-
7269
mark-memory-as-safe(new-ptr as U8[], nb);
7370

7471
# TODO: wrap counter adjustments in conditional compilation

0 commit comments

Comments
 (0)