Use proxy objects for MEMORY64 HEAP access over 4Gb #19737
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -134,11 +134,55 @@ var HEAP, | |
| var HEAP_DATA_VIEW; | ||
| #endif | ||
|
|
||
| function fixPointer (ptr) { | ||
| if (typeof ptr === 'number' && ptr < 0) { | ||
| return ptr >>> 0; | ||
| } | ||
| if (typeof ptr === 'bigint') { | ||
sbc100 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return Number(ptr); | ||
| } | ||
| return ptr; | ||
| } | ||
|
|
||
| const getHeapBlock = (type, offset, length) => { | ||
sbc100 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const maxSize = Math.min(wasmMemory.buffer.byteLength, 4 * 1024 * 1024 * 1024 - 8) | ||
|
|
||
| const heap = wasmMemory.buffer | ||
| switch (type) { | ||
| case 'i1': | ||
| case 'i8': | ||
| return new Int8Array(heap, offset, length || maxSize / Int8Array.BYTES_PER_ELEMENT); | ||
| case 'u1': | ||
| case 'u8': | ||
| return new Uint8Array(heap, offset, length || maxSize / Uint8Array.BYTES_PER_ELEMENT); | ||
| case 'i16': | ||
| return new Int16Array(heap, offset, length || maxSize / Int16Array.BYTES_PER_ELEMENT); | ||
| case 'u16': | ||
| return new Uint16Array(heap, offset, length || maxSize / Uint16Array.BYTES_PER_ELEMENT); | ||
| case 'i32': | ||
| return new Int32Array(heap, offset, length || maxSize / Int32Array.BYTES_PER_ELEMENT); | ||
| case 'u32': | ||
| return new Uint32Array(heap, offset, length || maxSize / Uint32Array.BYTES_PER_ELEMENT); | ||
| case 'f32': | ||
| return new Float32Array(heap, offset, length || maxSize / Float32Array.BYTES_PER_ELEMENT); | ||
| case 'f64': | ||
| return new Float64Array(heap, offset, length || maxSize / Float64Array.BYTES_PER_ELEMENT); | ||
| case 'i64': | ||
| return new BigInt64Array(heap, offset, length || maxSize / BigInt64Array.BYTES_PER_ELEMENT); | ||
| case '*': | ||
| case 'u64': | ||
| return new BigUint64Array(heap, offset, length || maxSize / BigUint64Array.BYTES_PER_ELEMENT); | ||
| default: | ||
| throw new Error('Invalid type'); | ||
| } | ||
| } | ||
|
|
||
| function updateMemoryViews() { | ||
| var b = wasmMemory.buffer; | ||
| #if SUPPORT_BIG_ENDIAN | ||
| Module['HEAP_DATA_VIEW'] = HEAP_DATA_VIEW = new DataView(b); | ||
| #endif | ||
| #if !WASM_BIGINT | ||
sbc100 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Module['HEAP8'] = HEAP8 = new Int8Array(b); | ||
| Module['HEAP16'] = HEAP16 = new Int16Array(b); | ||
| Module['HEAP32'] = HEAP32 = new Int32Array(b); | ||
|
|
@@ -147,9 +191,101 @@ function updateMemoryViews() { | |
| Module['HEAPU32'] = HEAPU32 = new Uint32Array(b); | ||
| Module['HEAPF32'] = HEAPF32 = new Float32Array(b); | ||
| Module['HEAPF64'] = HEAPF64 = new Float64Array(b); | ||
| #else | ||
| var maxArraySize = Math.min(b.byteLength, 4 * 1024 * 1024 * 1024 - 8); | ||
| var proxyHandler = (type, hb) => ({ | ||
| heapBlock: hb, | ||
| copyWithin: function (target, start, end) { | ||
| target = fixPointer(target) | ||
| start = fixPointer(start) | ||
| end = fixPointer(end) | ||
|
There was a problem hiding this comment. I'm hoping you can simply remove |
||
| const bpe = hb.BYTES_PER_ELEMENT | ||
| if (target * bpe >= maxArraySize || start * bpe >= maxArraySize || (end && end * bpe >= maxArraySize)) { | ||
| var len = end - start | ||
| var targetArray = getHeapBlock(type, target * bpe, len) | ||
| var sourceArray = getHeapBlock(type, start * bpe, len) | ||
| targetArray.set(sourceArray) | ||
| return hb | ||
| } else { | ||
| return hb.copyWithin(target, start, end) | ||
| } | ||
| }, | ||
| setOverridden: function (array, offset) { | ||
| offset = fixPointer(offset) | ||
| var offsetReal = (offset || 0) * hb.BYTES_PER_ELEMENT | ||
| if (offsetReal >= maxArraySize || array.byteLength + offsetReal >= maxArraySize) { | ||
| var targetArray = getHeapBlock(type, offsetReal, array.length) | ||
| targetArray.set(array) | ||
| } else { | ||
| hb.set(array, offset) | ||
| } | ||
| }, | ||
| subarray: function (start, end) { | ||
| start = fixPointer(start) | ||
| end = fixPointer(end) | ||
| var startReal = (start || 0) * hb.BYTES_PER_ELEMENT | ||
| var endReal = end ? end * hb.BYTES_PER_ELEMENT : wasmMemory.byteLength | ||
| if (startReal >= maxArraySize || endReal >= maxArraySize) { | ||
| return getHeapBlock(type, startReal, endReal - startReal) | ||
| } else { | ||
| return hb.subarray(start, end) | ||
| } | ||
| }, | ||
| get: function (target, property) { | ||
| if (typeof property === 'number' || typeof property === 'bigint') { | ||
| var memoryOffset = fixPointer(property) * target.BYTES_PER_ELEMENT | ||
| if (memoryOffset >= maxArraySize) { | ||
| var heap = getHeapBlock(type, memoryOffset, 1); | ||
| return heap[0]; | ||
| } else { | ||
| return this.heapBlock[property] | ||
| } | ||
| } | ||
|
|
||
| if (property === 'copyWithin') { | ||
| return this.copyWithin | ||
| } | ||
|
|
||
| if (property === 'set') { | ||
| return this.setOverridden | ||
| } | ||
|
|
||
| if (property === 'subarray') { | ||
| return this.subarray | ||
| } | ||
|
|
||
| return this.heapBlock[property] | ||
| }, | ||
| set: function (target, property, value) { | ||
| if (typeof property === 'number' || typeof property === 'bigint') { | ||
| var memoryOffset = fixPointer(property) * target.BYTES_PER_ELEMENT | ||
| if (memoryOffset >= maxArraySize) { | ||
| var heap = getHeapBlock(type, memoryOffset, 1); | ||
| heap[0] = value; | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| this.heapBlock[property] = value | ||
| return true; | ||
| }, | ||
| }) | ||
| function createMemoryProxy (type) | ||
| { | ||
| const block = getHeapBlock(type, 0) | ||
| return new Proxy(block, proxyHandler(type, block)); | ||
| } | ||
| Module["HEAP8"] = HEAP8 = createMemoryProxy('i8') | ||
| Module["HEAP16"] = HEAP16 = createMemoryProxy('i16') | ||
| Module["HEAP32"] = HEAP32 = createMemoryProxy('i32') | ||
| Module["HEAPU8"] = HEAPU8 = createMemoryProxy('u8') | ||
| Module["HEAPU16"] = HEAPU16 = createMemoryProxy('u16') | ||
| Module["HEAPU32"] = HEAPU32 = createMemoryProxy('u32') | ||
| Module["HEAPF32"] = HEAPF32 = createMemoryProxy('f32') | ||
| Module["HEAPF64"] = HEAPF64 = createMemoryProxy('f64') | ||
| Module["HEAP64"] = HEAP64 = createMemoryProxy('i64') | ||
| Module["HEAPU64"] = HEAPU64 = createMemoryProxy('u64') | ||
| Module["MEMORY"] = b; | ||
| #endif | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line can now be reverted since CAN_ADDRESS_2GB is never set when MEMORY64 is set: See #19755