Skip to content

Commit

Permalink
add formulas for relocation
Browse files Browse the repository at this point in the history
  • Loading branch information
@AntoineFONDEUR
AntoineFONDEUR committed Sep 11, 2024
1 parent d2b6d36 commit 188b3f6
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 124 deletions.
26 changes: 10 additions & 16 deletions src/ui/ui.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,16 @@ function loadProgram(program: any) {
}

function relocate() {
proverSheet.getRange("A3:G").clearContent();
proverSheet
.getRange("A1:C1")
.setValues([
["Concatenated Segments", "Pointers relocation", "Relocated Memory"],
]);
proverSheet.getRange("E1").setValue([["Relocated Trace"]]);
proverSheet.getRange("C2:D2").setValues([["Addresses", "Values"]]);
proverSheet.getRange("E2:G2").setValues([["PC", "FP", "AP"]]);
proverSheet.getRange("A1:A2").mergeVertically();
proverSheet.getRange("B1:B2").mergeVertically();
proverSheet.getRange("C1:D1").mergeAcross();
proverSheet.getRange("E1:G1").mergeAcross();
proverSheet.getRange(`A3:${columns[k]}`).clearContent();

proverSheet.getRange("A1").setValue("Memory");
proverSheet.getRange(`A1:D1`).mergeAcross();

proverSheet.getRange(`E1`).setValue("Relocated Trace");
proverSheet.getRange(`E1:G1`).mergeAcross();

proverSheet.getRange(`${provSegmentsColumn}2:${provRelocatedApColumn}2`).setValues([["Segments", "Addresses","Values","Relocated","PC","FP","AP"]]);

concatenateSegments();
relocatePointers();
pointersToIndexes();
relocateMemory();
relocateTrace();
}
55 changes: 21 additions & 34 deletions src/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ function objectFromEntries(keys: any, values: any): any {
}

function getLastActiveRowNumber(column: string, sheet): number {
let columunValues: string[] = transpose(
sheet.getRange(`${column}1:${column}`).getValues(),
)[0];
for (let i = columunValues.length - 1; i >= 0; i--) {
if (columunValues[i] != "") {
return i + 1;
}
let columnValues: string[] = sheet.getRange(`${column}1:${column}`).getValues().map(element => {
return (element && element.length > 0) ? element[0] : "";
});
let lastNonEmptyIndex = columnValues.slice().reverse().findIndex(value => value !== "");
if (lastNonEmptyIndex === -1) {
return 0;
}
return 1;

return columnValues.length - lastNonEmptyIndex;
}

function getLastActiveFormulaRowNumber(column: string, sheet): number {
let columunValues: string[] = transpose(
sheet.getRange(`${column}1:${column}`).getFormulas(),
)[0];
for (let i = columunValues.length - 1; i >= 0; i--) {
if (columunValues[i] != "") {
return i + 1;
}
let columnValues: string[] = sheet.getRange(`${column}1:${column}`).getFormulas().map(element => {
return (element && element.length > 0) ? element[0] : "";
});
let lastNonEmptyIndex = columnValues.slice().reverse().findIndex(value => value !== "");
if (lastNonEmptyIndex === -1) {
return 0;
}
return 0;

return columnValues.length - lastNonEmptyIndex;
}

function encodeUTF8(str: string): Uint8Array {
Expand Down Expand Up @@ -120,24 +120,11 @@ function updateBuiltins() {
}
}

function transpose(matrix: string[][]): string[][] {
if (matrix.length === 0 || matrix[0].length === 0) {
return [];
}

let transposed: string[][] = [];

for (let i = 0; i < matrix[0].length; i++) {
transposed[i] = [];

for (let j = 0; j < matrix.length; j++) {
transposed[i][j] = matrix[j][i];
}
}

return transposed;
}

function letterToIndex(char: string | String): number {
return char.charCodeAt(0) - "A".charCodeAt(0);
}

function isFinalPc(pc: number | string): boolean{
const finalPcColumnIndex: number = runSheet.getRange("1:1").getValues()[0].indexOf(FINAL_PC);
return finalPcColumnIndex == letterToIndex(pc.toString()[0]);
}
4 changes: 2 additions & 2 deletions src/vm/constants.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,5 +129,5 @@ const FpUpdates: FpUpdatesType = {
ApPlus2: "AP + 2",
};

const FINAL_FP: string = "<FINAL_FP>";
const FINAL_PC: string = "<FINAL_PC>";
const FINAL_FP: string = "final_fp";
const FINAL_PC: string = "final_pc";
108 changes: 36 additions & 72 deletions src/vm/vm.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@ j++;
const progFpupdateColumn: String = columns[j];
j++;

let k = 0;
const provSegmentsColumn: String = columns[k];
k++;
const provAddressColumn: String = columns[k];
k++;
const provValuesColumn: String = columns[k];
k++;
const provMemoryRelocatedColumn: String = columns[k];
k++;
const provRelocatedPcColumn: String = columns[k];
k++;
const provRelocatedFpColumn: String = columns[k];
k++;
const provRelocatedApColumn: String = columns[k];
k++;

type Builtins = {
output: BuitlinType;
pedersen: BuitlinType;
Expand Down Expand Up @@ -121,7 +137,7 @@ function initializeBuiltins(builtinsList: string[]): string[] {
];
runSheet
.getRange(`${builtins[builtinsList[0]].column}1:${pcRow}1`)
.setValues([[...builtinsList, "final_fp", "final_pc"]]);
.setValues([[...builtinsList, FINAL_FP, FINAL_PC]]);

return [
...builtinsList.map((builtin) => `${builtins[builtin].column}2`),
Expand Down Expand Up @@ -443,14 +459,14 @@ function step(n: number = 0): void {
function runUntilPc(): void {
let i: number = getLastActiveRowNumber(`${pcColumn}`, runSheet) - 2;
let pc: string = runSheet.getRange(`${pcColumn}${i + 1 + 1}`).getValue();
while (!isCell(pc)) {
while (!isFinalPc(pc)) {
step(i);
i++;
pc = runSheet.getRange(`${pcColumn}${i + 1 + 1}`).getValue();
}
}

function concatenateSegments() {
function relocateMemory() {
let formulas: string[] = [];
let columnIndex: number = letterToIndex(executionColumn);
while (runSheet.getRange(1, columnIndex + 1).getValue() != "") {
Expand All @@ -463,91 +479,39 @@ function concatenateSegments() {
columnIndex++;
}
proverSheet
.getRange(3, 1, formulas.length)
.getRange(3, letterToIndex(provValuesColumn)+1, formulas.length)
.setFormulas(formulas.map((formula) => [formula]));
}

function relocatePointers() {
let lastActiveRowNumber: number = getLastActiveFormulaRowNumber(
"A",
proverSheet,
);
let rangeColumA = proverSheet.getRange(3, 1, lastActiveRowNumber - 2);
let formulasColumnA: string[] = transpose(rangeColumA.getFormulas())[0];
let valuesColumnA: string[] = transpose(rangeColumA.getValues())[0];
let formulasColumnB: string[] = [];
valuesColumnA.forEach((value) => {
if (isCell(value)) {
let indexOfCellPointed: number = formulasColumnA.indexOf(`=Run!${value}`);
formulasColumnB.push(`=B${3 + indexOfCellPointed}`);
} else {
formulasColumnB.push(`="${value}"`);
}
});
proverSheet
.getRange(3, 2, formulasColumnB.length)
.setFormulas(formulasColumnB.map((formula) => [formula]));
}
proverSheet.getRange(3,letterToIndex(provSegmentsColumn)+1,formulas.length).setFormulas(formulas.map( (_ ,index) => [`=FORMULATEXT(${provValuesColumn}${index+3})`]))

function pointersToIndexes() {
let lastActiveRowNumber: number = getLastActiveFormulaRowNumber(
"B",
proverSheet,
);
let formulasColumnB: string[] = transpose(
proverSheet.getRange(3, 2, lastActiveRowNumber - 2).getFormulas(),
)[0];
let valueFormulas: string[] = [];
formulasColumnB.forEach((value) => {
if (isCell(value.substring(1))) {
valueFormulas.push(`="${Number(value.substring(2)) - 3}"`);
} else {
valueFormulas.push(`=${value.substring(1)}`);
}
});
let addressesValues: number[] = Array.from(valueFormulas.keys());
proverSheet.getRange(3, letterToIndex(provAddressColumn)+1,formulas.length).setFormulas(formulas.map( (_ ,index) => [`=RIGHT(${provSegmentsColumn}${index+3};LEN(${provSegmentsColumn}${index+3}) - 5)`]));

proverSheet
.getRange(3, 3, addressesValues.length)
.setValues(addressesValues.map((formula) => [formula]));
proverSheet
.getRange(3, 4, valueFormulas.length)
.setFormulas(valueFormulas.map((formula) => [formula]));
proverSheet.getRange(3,letterToIndex(provMemoryRelocatedColumn)+1,formulas.length).setFormulas(formulas.map( (_ ,index) => [`=IFERROR(MATCH(${provValuesColumn}${index+3};${provAddressColumn}3:${provAddressColumn}); ${provValuesColumn}${index+3})`]));
}

function relocateTrace() {
let relocatedPC: number[] = [];
let relocatedFP: number[] = [];
let relocatedAP: number[] = [];
let relocatedPCFormulas: string[] = [];
let relocatedFPFormulas: string[] = [];
let relocatedAPFormulas: string[] = [];

let registersValue: string[][] = runSheet
.getRange(`${pcColumn}2:${apColumn}`)
.getValues();
registersValue.forEach(([pc, fp, ap]) => {
registersValue.forEach(([pc, fp, ap], index) => {
if (Boolean(pc) && Boolean(fp) && Boolean(ap)) {
relocatedPC.push(registerRelocation(pc));
relocatedFP.push(registerRelocation(fp));
relocatedAP.push(registerRelocation(ap));
relocatedPCFormulas.push(`=IFERROR(MATCH(Run!${pcColumn}${index+2};${provAddressColumn}3:${provAddressColumn});Run!${pcColumn}${index+2})`);
relocatedFPFormulas.push(`=IFERROR(MATCH(Run!${fpColumn}${index+2};${provAddressColumn}3:${provAddressColumn});Run!${fpColumn}${index+2})`);
relocatedAPFormulas.push(`=IFERROR(MATCH(Run!${apColumn}${index+2};${provAddressColumn}3:${provAddressColumn});Run!${apColumn}${index+2})`);
}
});

proverSheet
.getRange(3, 5, relocatedPC.length)
.setValues(relocatedPC.map((pc) => [pc]));
.getRange(3, 5, relocatedPCFormulas.length)
.setFormulas(relocatedPCFormulas.map((pc) => [pc]));
proverSheet
.getRange(3, 6, relocatedFP.length)
.setValues(relocatedFP.map((pc) => [pc]));
.getRange(3, 6, relocatedFPFormulas.length)
.setFormulas(relocatedFPFormulas.map((fp) => [fp]));
proverSheet
.getRange(3, 7, relocatedAP.length)
.setValues(relocatedAP.map((pc) => [pc]));
}

function registerRelocation(myRegister: string): number {
if (isCell(myRegister)) {
return transpose(proverSheet.getRange("A3:A").getFormulas())[0].indexOf(
`=Run!${myRegister}`,
);
} else {
return Number(myRegister);
}
.getRange(3, 7, relocatedAPFormulas.length)
.setFormulas(relocatedAPFormulas.map((ap) => [ap]));
}

0 comments on commit 188b3f6

Please sign in to comment.