Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ under the licensing terms detailed in LICENSE:
* Kam Chehresa <kaz.che@gmail.com>
* Mopsgamer <79159094+Mopsgamer@users.noreply.github.com>
* EDM115 <github@edm115.dev>
* Geraint Luff <luffgd@gmail.com>

Portions of this software are derived from third-party works licensed under
the following terms:
Expand Down
5 changes: 5 additions & 0 deletions src/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,11 @@ export class Compiler extends DiagnosticEmitter {
}
}

if (options.willOptimize) {
// Binaryen will split this up more efficiently
memorySegments = module.combineMemorySegments(memorySegments);
}

// Setup internal memory with default name "0"
module.setMemory(
initialPages,
Expand Down
16 changes: 16 additions & 0 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2337,6 +2337,22 @@ export class Module {
/** Unlimited memory constant. */
static readonly UNLIMITED_MEMORY: Index = <Index>-1;

combineMemorySegments(
segments: MemorySegment[]
) : MemorySegment[] {
if (!segments.length) return segments;
segments = segments.slice(0);
let lastSegment = segments[segments.length - 1];
let length = u32(lastSegment.offset) + lastSegment.buffer.length;
let newBuffer = new Uint8Array(u32(length));
let k = segments.length;
for (let i = 0; i < k; ++i) {
let segment = unchecked(segments[i]);
newBuffer.set(segment.buffer, u32(segment.offset));
}
return [new MemorySegment(newBuffer, i64_new(0))];
}

setMemory(
initial: Index,
maximum: Index,
Expand Down
Loading