Commit f738bb24 authored by Andreas Haas's avatar Andreas Haas Committed by Commit Bot

[wasm][cleanup] Remove kV8MaxPages from wasm-constants.js

It is better not to have V8-specific constants in mjsunit.js because it
also has V8-independent uses, e.g. in the spec tests.

R=gdeepti@chromium.org

Bug: v8:8015
Change-Id: I3b576f093f639c13e673cbd0bd5305c8101d7281
Reviewed-on: https://chromium-review.googlesource.com/1192843Reviewed-by: 's avatarDeepti Gandluri <gdeepti@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55485}
parent 452d8a3a
...@@ -6,7 +6,7 @@ load("test/mjsunit/wasm/wasm-constants.js"); ...@@ -6,7 +6,7 @@ load("test/mjsunit/wasm/wasm-constants.js");
load("test/mjsunit/wasm/wasm-module-builder.js"); load("test/mjsunit/wasm/wasm-module-builder.js");
const builder = new WasmModuleBuilder(); const builder = new WasmModuleBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
builder.addFunction('load', kSig_i_ii) builder.addFunction('load', kSig_i_ii)
.addBody([ .addBody([
kExprGetLocal, 0, kExprGetLocal, 0,
......
...@@ -9,7 +9,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js"); ...@@ -9,7 +9,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
let module = (() => { let module = (() => {
let builder = new WasmModuleBuilder(); let builder = new WasmModuleBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
builder.addFunction("grow_memory", kSig_i_i) builder.addFunction("grow_memory", kSig_i_i)
.addBody([kExprGetLocal, 0, kExprGrowMemory, kMemoryZero]) .addBody([kExprGetLocal, 0, kExprGrowMemory, kMemoryZero])
.exportFunc(); .exportFunc();
......
...@@ -37,11 +37,15 @@ function genGrowMemoryBuilder() { ...@@ -37,11 +37,15 @@ function genGrowMemoryBuilder() {
return builder; return builder;
} }
// V8 internal memory size limit.
var kV8MaxPages = 32767;
// TODO(gdeepti): Generate tests programatically for all the sizes instead of // TODO(gdeepti): Generate tests programatically for all the sizes instead of
// current implementation. // current implementation.
function testGrowMemoryReadWrite32() { function testGrowMemoryReadWrite32() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset; var offset;
function peek() { return module.exports.load(offset); } function peek() { return module.exports.load(offset); }
...@@ -88,7 +92,7 @@ testGrowMemoryReadWrite32(); ...@@ -88,7 +92,7 @@ testGrowMemoryReadWrite32();
function testGrowMemoryReadWrite16() { function testGrowMemoryReadWrite16() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset; var offset;
function peek() { return module.exports.load16(offset); } function peek() { return module.exports.load16(offset); }
...@@ -135,7 +139,7 @@ testGrowMemoryReadWrite16(); ...@@ -135,7 +139,7 @@ testGrowMemoryReadWrite16();
function testGrowMemoryReadWrite8() { function testGrowMemoryReadWrite8() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset; var offset;
function peek() { return module.exports.load8(offset); } function peek() { return module.exports.load8(offset); }
...@@ -182,7 +186,7 @@ testGrowMemoryReadWrite8(); ...@@ -182,7 +186,7 @@ testGrowMemoryReadWrite8();
function testGrowMemoryZeroInitialSize() { function testGrowMemoryZeroInitialSize() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(0, kV8MaxPages, false); builder.addMemory(0, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset; var offset;
function peek() { return module.exports.load(offset); } function peek() { return module.exports.load(offset); }
...@@ -216,7 +220,7 @@ testGrowMemoryZeroInitialSize(); ...@@ -216,7 +220,7 @@ testGrowMemoryZeroInitialSize();
function testGrowMemoryZeroInitialSize32() { function testGrowMemoryZeroInitialSize32() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(0, kV8MaxPages, false); builder.addMemory(0, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset; var offset;
function peek() { return module.exports.load(offset); } function peek() { return module.exports.load(offset); }
...@@ -242,7 +246,7 @@ testGrowMemoryZeroInitialSize32(); ...@@ -242,7 +246,7 @@ testGrowMemoryZeroInitialSize32();
function testGrowMemoryZeroInitialSize16() { function testGrowMemoryZeroInitialSize16() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(0, kV8MaxPages, false); builder.addMemory(0, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset; var offset;
function peek() { return module.exports.load16(offset); } function peek() { return module.exports.load16(offset); }
...@@ -268,7 +272,7 @@ testGrowMemoryZeroInitialSize16(); ...@@ -268,7 +272,7 @@ testGrowMemoryZeroInitialSize16();
function testGrowMemoryZeroInitialSize8() { function testGrowMemoryZeroInitialSize8() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(0, kV8MaxPages, false); builder.addMemory(0, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset; var offset;
function peek() { return module.exports.load8(offset); } function peek() { return module.exports.load8(offset); }
...@@ -294,7 +298,7 @@ testGrowMemoryZeroInitialSize8(); ...@@ -294,7 +298,7 @@ testGrowMemoryZeroInitialSize8();
function testGrowMemoryTrapMaxPagesZeroInitialMemory() { function testGrowMemoryTrapMaxPagesZeroInitialMemory() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(0, kV8MaxPages, false); builder.addMemory(0, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
function growMem(pages) { return module.exports.grow_memory(pages); } function growMem(pages) { return module.exports.grow_memory(pages); }
assertEquals(-1, growMem(kV8MaxPages + 1)); assertEquals(-1, growMem(kV8MaxPages + 1));
...@@ -314,7 +318,7 @@ testGrowMemoryTrapMaxPages(); ...@@ -314,7 +318,7 @@ testGrowMemoryTrapMaxPages();
function testGrowMemoryTrapsWithNonSmiInput() { function testGrowMemoryTrapsWithNonSmiInput() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(0, kV8MaxPages, false); builder.addMemory(0, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
function growMem(pages) { return module.exports.grow_memory(pages); } function growMem(pages) { return module.exports.grow_memory(pages); }
// The parameter of grow_memory is unsigned. Therefore -1 stands for // The parameter of grow_memory is unsigned. Therefore -1 stands for
...@@ -326,7 +330,7 @@ testGrowMemoryTrapsWithNonSmiInput(); ...@@ -326,7 +330,7 @@ testGrowMemoryTrapsWithNonSmiInput();
function testGrowMemoryCurrentMemory() { function testGrowMemoryCurrentMemory() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
builder.addFunction("memory_size", kSig_i_v) builder.addFunction("memory_size", kSig_i_v)
.addBody([kExprMemorySize, kMemoryZero]) .addBody([kExprMemorySize, kMemoryZero])
.exportFunc(); .exportFunc();
...@@ -342,7 +346,7 @@ testGrowMemoryCurrentMemory(); ...@@ -342,7 +346,7 @@ testGrowMemoryCurrentMemory();
function testGrowMemoryPreservesDataMemOp32() { function testGrowMemoryPreservesDataMemOp32() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset, val; var offset, val;
function peek() { return module.exports.load(offset); } function peek() { return module.exports.load(offset); }
...@@ -365,7 +369,7 @@ testGrowMemoryPreservesDataMemOp32(); ...@@ -365,7 +369,7 @@ testGrowMemoryPreservesDataMemOp32();
function testGrowMemoryPreservesDataMemOp16() { function testGrowMemoryPreservesDataMemOp16() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset, val; var offset, val;
function peek() { return module.exports.load16(offset); } function peek() { return module.exports.load16(offset); }
...@@ -388,7 +392,7 @@ testGrowMemoryPreservesDataMemOp16(); ...@@ -388,7 +392,7 @@ testGrowMemoryPreservesDataMemOp16();
function testGrowMemoryPreservesDataMemOp8() { function testGrowMemoryPreservesDataMemOp8() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset, val = 0; var offset, val = 0;
function peek() { return module.exports.load8(offset); } function peek() { return module.exports.load8(offset); }
...@@ -415,7 +419,7 @@ testGrowMemoryPreservesDataMemOp8(); ...@@ -415,7 +419,7 @@ testGrowMemoryPreservesDataMemOp8();
function testGrowMemoryOutOfBoundsOffset() { function testGrowMemoryOutOfBoundsOffset() {
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset, val; var offset, val;
function peek() { return module.exports.load(offset); } function peek() { return module.exports.load(offset); }
...@@ -492,7 +496,7 @@ testGrowMemoryDeclaredSpecMaxTraps(); ...@@ -492,7 +496,7 @@ testGrowMemoryDeclaredSpecMaxTraps();
function testGrowMemory2Gb() { function testGrowMemory2Gb() {
print("testGrowMemory2Gb"); print("testGrowMemory2Gb");
var builder = genGrowMemoryBuilder(); var builder = genGrowMemoryBuilder();
builder.addMemory(1, kV8MaxPages, false); builder.addMemory(1, undefined, false);
var module = builder.instantiate(); var module = builder.instantiate();
var offset, val; var offset, val;
function peek() { return module.exports.load(offset); } function peek() { return module.exports.load(offset); }
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
load("test/mjsunit/wasm/wasm-constants.js"); load("test/mjsunit/wasm/wasm-constants.js");
load("test/mjsunit/wasm/wasm-module-builder.js"); load("test/mjsunit/wasm/wasm-module-builder.js");
// V8 internal memory size limit.
var kV8MaxPages = 32767;
(function TestOne() { (function TestOne() {
print("TestOne"); print("TestOne");
let memory = new WebAssembly.Memory({initial: 1}); let memory = new WebAssembly.Memory({initial: 1});
......
...@@ -15,9 +15,6 @@ function bytes() { ...@@ -15,9 +15,6 @@ function bytes() {
return buffer; return buffer;
} }
// V8 internal constants
var kV8MaxPages = 32767;
// Header declaration constants // Header declaration constants
var kWasmH0 = 0; var kWasmH0 = 0;
var kWasmH1 = 0x61; var kWasmH1 = 0x61;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment