From db5436c4c2cc9732f0cc42c3fd2ea35cd55f5ad4 Mon Sep 17 00:00:00 2001 From: Federica Date: Mon, 31 Jul 2023 11:14:35 -0300 Subject: [PATCH 1/3] Expose relocatable fields --- pkg/vm/memory/relocatable.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/vm/memory/relocatable.go b/pkg/vm/memory/relocatable.go index 8a6654a1..ce094f3a 100644 --- a/pkg/vm/memory/relocatable.go +++ b/pkg/vm/memory/relocatable.go @@ -5,8 +5,8 @@ package memory // these values are replaced by real memory addresses, // represented by a field element. type Relocatable struct { - segmentIndex int - offset uint + SegmentIndex int + Offset uint } // Creates a new Relocatable struct with the specified segment index From b235f23e727711c1d8812a636d450b9d4b71321a Mon Sep 17 00:00:00 2001 From: Federica Date: Mon, 31 Jul 2023 11:15:14 -0300 Subject: [PATCH 2/3] Add method NewMaybeRelocatableRelocatable to complete MaybeRelocatable api --- pkg/vm/memory/relocatable.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/vm/memory/relocatable.go b/pkg/vm/memory/relocatable.go index ce094f3a..365e3a47 100644 --- a/pkg/vm/memory/relocatable.go +++ b/pkg/vm/memory/relocatable.go @@ -47,6 +47,11 @@ func NewMaybeRelocatableInt(felt uint) *MaybeRelocatable { return &MaybeRelocatable{inner: Int{felt}} } +// Creates a new MaybeRelocatable with a Relocatable inner value +func NewMaybeRelocatableRelocatable(relocatable Relocatable) *MaybeRelocatable { + return &MaybeRelocatable{inner: relocatable} +} + // Creates a new MaybeRelocatable with a `nil` inner value func NewMaybeRelocatableNil() *MaybeRelocatable { return &MaybeRelocatable{inner: nil} From 633bc1c0502bc7b079c998ac52c94b06279c7713 Mon Sep 17 00:00:00 2001 From: fmoletta <99273364+fmoletta@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:31:27 -0300 Subject: [PATCH 3/3] Update old comment --- pkg/vm/memory/relocatable.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/vm/memory/relocatable.go b/pkg/vm/memory/relocatable.go index 97196142..8fc2e5c0 100644 --- a/pkg/vm/memory/relocatable.go +++ b/pkg/vm/memory/relocatable.go @@ -25,7 +25,7 @@ type Int struct { // MaybeRelocatable is the type of the memory cells in the Cairo // VM. For now, `inner` will hold any type but it should be -// instantiated only with `Relocatable`, `Int` or `nil` types. +// instantiated only with `Relocatable` or `Int` types. // We should analyze better alternatives to this. type MaybeRelocatable struct { inner any