arnaucube/circom
1
0
Fork 0
mirror of https://github.com/arnaucube/circom.git synced 2026-02-07 03:06:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Multithread

Browse Source
This commit is contained in:
Jordi Baylina
2019-12-20 22:01:12 +01:00
parent e62c1cdbc3
commit b564201170
8 changed files with 137 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/c_build.js
View File

@@ -176,10 +176,11 @@ function buildCode(ctx) {
"/*\n" +
instanceDef +
"\n*/\n" +
`void ${fName}(Circom_CalcWit *ctx) {\n` +
`void ${fName}(Circom_CalcWit *ctx, int __cIdx) {\n` +
utils.ident(
ctx.codeHeader + "\n" +
ctx.code + "\n" +
"ctx->finished(__cIdx);\n" +
ctx.codeFooter
) +
"}\n";
@@ -204,7 +205,7 @@ function buildComponentsArray(ctx) {
ccodes.push(`Circom_Component _components[${ctx.components.length}] = {\n`);
for (let i=0; i< ctx.components.length; i++) {
ccodes.push(i>0 ? " ," : " ");
ccodes.push(`{${ctx.components[i].htName},${ctx.components[i].etName},${ctx.components[i].fnName}, ${ctx.components[i].nInSignals}}\n`);
ccodes.push(`{${ctx.components[i].htName},${ctx.components[i].etName},${ctx.components[i].fnName}, ${ctx.components[i].nInSignals}, true}\n`);
}
ccodes.push("};\n");
const codeComponents = ccodes.join("");

18
src/c_gen.js
View File

@@ -515,7 +515,7 @@ function genGetSubComponentOffset(ctx, cIdxRef, label) {
const cIdx = ctx.refs[cIdxRef];
s = cIdx.label;
} else {
s = "ctx->cIdx";
s = "__cIdx";
}
ctx.code += `${offset.label} = ctx->getSubComponentOffset(${s}, 0x${h}LL /* ${label} */);\n`;
return refOffset;
@@ -532,7 +532,7 @@ function genGetSubComponentSizes(ctx, cIdxRef, label) {
const cIdx = ctx.refs[cIdxRef];
s = cIdx.label;
} else {
s = "ctx->cIdx";
s = "__cIdx";
}
ctx.code += `${sizes.label} = ctx->getSubComponentSizes(${s}, 0x${h}LL /* ${label} */);\n`;
return sizesRef;
@@ -549,7 +549,7 @@ function genGetSigalOffset(ctx, cIdxRef, label) {
const cIdx = ctx.refs[cIdxRef];
s = cIdx.label;
} else {
s = "ctx->cIdx";
s = "__cIdx";
}
ctx.code += `${offset.label} = ctx->getSignalOffset(${s}, 0x${h}LL /* ${label} */);\n`;
return refOffset;
@@ -565,7 +565,7 @@ function genGetSignalSizes(ctx, cIdxRef, label) {
const cIdx = ctx.refs[cIdxRef];
s = cIdx.label;
} else {
s = "ctx->cIdx";
s = "__cIdx";
}
const h = utils.fnvHash(label);
ctx.code += `${sizes.label} = ctx->getSignalSizes(${s}, 0x${h}LL /* ${label} */);\n`;
@@ -585,10 +585,10 @@ function genSetSignal(ctx, cIdxRef, sIdxRef, valueRef) {
const cIdx = ctx.refs[cIdxRef];
s = cIdx.label;
} else {
s = "ctx->cIdx";
s = "__cIdx";
}
const sIdx = ctx.refs[sIdxRef];
ctx.code += `ctx->setSignal(${s}, ${sIdx.label}, ${v.label});\n`;
ctx.code += `ctx->setSignal(__cIdx, ${s}, ${sIdx.label}, ${v.label});\n`;
return valueRef;
}
@@ -602,10 +602,10 @@ function genGetSignal(ctx, cIdxRef, sIdxRef) {
const cIdx = ctx.refs[cIdxRef];
s = cIdx.label;
} else {
s = "ctx->cIdx";
s = "__cIdx";
}
const sIdx = ctx.refs[sIdxRef];
ctx.code += `ctx->getSignal(${s}, ${sIdx.label}, ${res.label});\n`;
ctx.code += `ctx->getSignal(__cIdx, ${s}, ${sIdx.label}, ${res.label});\n`;
return resRef;
}
@@ -747,7 +747,7 @@ function genConstraint(ctx, ast) {
const strErr = ast.fileName + ":" + ast.first_line + ":" + ast.first_column;
instantiateRef(ctx, aRef, a.value);
instantiateRef(ctx, bRef, b.value);
ctx.code += `ctx->checkConstraint(${a.label}, ${b.label}, "${strErr}");`;
ctx.code += `ctx->checkConstraint(__cIdx, ${a.label}, ${b.label}, "${strErr}");`;
}