fix fasfile pageSize
Jordi Baylina jordi@baylina.cat
Wed, 14 Oct 2020 09:49:13 +0200
3 files changed,
14 insertions(+),
8 deletions(-)
M
ports/c/builder.js
→
ports/c/builder.js
@@ -661,11 +661,6 @@ }
async _buildCircuitVar(fdData) { - const pP = fdData.pos; - - const strBuff = new TextEncoder("utf-8").encode(this.header.P.toString()); - await fdData.write(strBuff); - const buff = new Uint8Array(72); const buffV = new DataView(buff.buffer);@@ -673,7 +668,7 @@ utils.setUint64(buffV, 0, this.pWit2Sig, true);
utils.setUint64(buffV, 8, this.pComponents, true); utils.setUint64(buffV, 16, this.pMapIsInput, true); utils.setUint64(buffV, 24, this.pConstants, true); - utils.setUint64(buffV, 32, pP, true); + utils.setUint64(buffV, 32, this.pPriemStr, true); utils.setUint64(buffV, 40, this.pCets, true); buffV.setUint32(48, this.header.NSignals, true);@@ -688,6 +683,16 @@
await fdData.write(buff); } + async _buildPrimeStr(fdData) { + this.pPriemStr = fdData.pos; + const strBuff = new TextEncoder("utf-8").encode(this.header.P.toString()); + await fdData.write(strBuff); + + const zB = new Uint8Array(1); + zB[0] =0; + await fdData.write(zB); + } + async build(fdCode, fdData) { const encoder = new TextEncoder("utf-8");@@ -696,6 +701,7 @@ while (fdData.pos % 8) fdData.pos++;
const code=new BigArray(); this._buildHeader(code); + await this._buildPrimeStr(fdData); await this._buildSizes(fdData); await this._buildConstants(fdData); await this._buildHashMaps(fdData);
M
ports/wasm/build_runtime.js
→
ports/wasm/build_runtime.js
@@ -473,7 +473,7 @@ )
); f.addCode( - c.if( // If ( mapIsInput[s >> 5] & 1 << (s & 0x1f) ) + c.if( // If ( mapIsInput[s >> 5] & (1 << (s & 0x1f)) ) c.i32_and( c.i32_load( c.i32_add(
M
src/r1csfile.js
→
src/r1csfile.js
@@ -8,7 +8,7 @@
async function buildR1cs(ctx, fileName) { - const fd = await fastFile.createOverride(fileName, 1<<22, 1<<24); + const fd = await fastFile.createOverride(fileName, 1<<24, 1<<22); const buffBigInt = new Uint8Array(ctx.F.n8);