Skip to content

feat(avm): Simulator enforces integral tag for DIV and field tag for FDIV #9944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeanmon merged 2 commits into from
Nov 13, 2024
Merged

feat(avm): Simulator enforces integral tag for DIV and field tag for FDIV #9944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b8d1ac
Simulator is enforcing integral tag type for DIV and field tag type for
Nov 13, 2024
3389d57
Fixing test
Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ describe('Arithmetic Instructions', () => {
});

describe.each([
[new Field(200n), new Field(99n), new Field(2n), TypeTag.FIELD],
[new Uint8(200n), new Uint8(99n), new Uint8(2n), TypeTag.UINT8],
[new Uint16(200n), new Uint16(99n), new Uint16(2n), TypeTag.UINT16],
[new Uint32(200n), new Uint32(99n), new Uint32(2n), TypeTag.UINT32],
Expand Down
23 changes: 21 additions & 2 deletions yarn-project/simulator/src/avm/opcodes/arithmetic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import type { AvmContext } from '../avm_context.js';
import { type Field, type MemoryValue } from '../avm_memory_types.js';
import {
type Field,
type MemoryValue,
TaggedMemory,
type TaggedMemoryInterface,
TypeTag,
} from '../avm_memory_types.js';
import { ArithmeticError } from '../errors.js';
import { Opcode } from '../serialization/instruction_serialization.js';
import { Addressing } from './addressing_mode.js';
Expand All @@ -13,7 +19,7 @@ export abstract class ThreeOperandArithmeticInstruction extends ThreeOperandInst
const operands = [this.aOffset, this.bOffset, this.dstOffset];
const addressing = Addressing.fromWire(this.indirect, operands.length);
const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
memory.checkTagsAreSame(aOffset, bOffset);
this.checkTags(memory, aOffset, bOffset);

const a = memory.get(aOffset);
const b = memory.get(bOffset);
Expand All @@ -25,6 +31,9 @@ export abstract class ThreeOperandArithmeticInstruction extends ThreeOperandInst
}

protected abstract compute(a: MemoryValue, b: MemoryValue): MemoryValue;
protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number) {
memory.checkTagsAreSame(aOffset, bOffset);
}
}

export class Add extends ThreeOperandArithmeticInstruction {
Expand Down Expand Up @@ -65,6 +74,11 @@ export class Div extends ThreeOperandArithmeticInstruction {

return a.div(b);
}

protected override checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number) {
memory.checkTagsAreSame(aOffset, bOffset);
TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset)); // Follows that bOffset tag is also of integral type
}
}

export class FieldDiv extends ThreeOperandArithmeticInstruction {
Expand All @@ -75,4 +89,9 @@ export class FieldDiv extends ThreeOperandArithmeticInstruction {
// return (a as Field).fdiv(b as Field);
return a.fdiv(b);
}

protected override checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number) {
memory.checkTagsAreSame(aOffset, bOffset);
memory.checkTag(TypeTag.FIELD, aOffset); // Follows that bOffset has also tag of type Field
}
}