refactor pvm memory

Blockchain/Sources/Blockchain/VMInvocations/HostCall/HostCall.swift

@@ -22,7 +22,7 @@
         do {
             try await _callImpl(config: config, state: state)
             return .continued
-        } catch let e as Memory.Error {
+        } catch let e as MemoryError {
             logger.error("memory error: \(e)")
             return .exit(.pageFault(e.address))
         } catch VMInvocationsError.forceHalt {

Blockchain/Sources/Blockchain/VMInvocations/HostCall/HostCalls.swift

@@ -763,7 +763,7 @@
         let innerVmIndex = UInt64(context.pvms.count)
         let code = isReadable ? try state.readMemory(address: regs[0], length: Int(regs[1])) : nil
         let pc = UInt32(truncatingIfNeeded: regs[2])
-        let mem = Memory(pageMap: [], chunks: [])
+        let mem = try GeneralMemory(pageMap: [], chunks: [])
 
         if code == nil {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.OOB.rawValue)
@@ -852,7 +852,7 @@
         self.context = context
     }
 
-    public func _callImpl(config: ProtocolConfigRef, state: VMState) async throws {
+    public func _callImpl(config _: ProtocolConfigRef, state: VMState) async throws {
         let regs: [UInt64] = state.readRegisters(in: 7 ..< 10)
 
         if context.pvms[regs[0]] == nil {
@@ -864,11 +864,7 @@
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.OOB.rawValue)
         } else {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.OK.rawValue)
-            // TODO: update after pvm memory is updated to have pages and able to allocate with accessiblity
-            try context.pvms[regs[0]]!.memory.write(
-                address: UInt32(truncatingIfNeeded: regs[1] * UInt64(config.value.pvmMemoryPageSize)),
-                values: Data(repeating: 0, count: Int(regs[2] * UInt64(config.value.pvmMemoryPageSize)))
-            )
+            try context.pvms[regs[0]]!.memory.zero(pageIndex: UInt32(truncatingIfNeeded: regs[1]), pages: Int(regs[2]))
         }
     }
 }
@@ -883,24 +879,21 @@
         self.context = context
     }
 
-    public func _callImpl(config: ProtocolConfigRef, state: VMState) async throws {
+    public func _callImpl(config _: ProtocolConfigRef, state: VMState) async throws {
         let regs: [UInt64] = state.readRegisters(in: 7 ..< 10)
 
         if context.pvms[regs[0]] == nil {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.WHO.rawValue)
             return
         }
 
-        // TODO: update when can check if pages are inaccessible
-        if (regs[1] + regs[2]) >= (1 << 32) {
+        if (regs[1] + regs[2]) >= (1 << 32) ||
+            !context.pvms[regs[0]]!.memory.isReadable(pageStart: UInt32(truncatingIfNeeded: regs[1]), pages: Int(regs[2]))
+        {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.OOB.rawValue)
         } else {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.OK.rawValue)
-            // TODO: update after pvm memory is updated to have pages and able to allocate with accessiblity
-            try context.pvms[regs[0]]!.memory.write(
-                address: UInt32(truncatingIfNeeded: regs[1] * UInt64(config.value.pvmMemoryPageSize)),
-                values: Data(repeating: 0, count: Int(regs[2] * UInt64(config.value.pvmMemoryPageSize)))
-            )
+            try context.pvms[regs[0]]!.memory.void(pageIndex: UInt32(truncatingIfNeeded: regs[1]), pages: Int(regs[2]))
         }
     }
 }

PolkaVM/Package.swift

@@ -19,6 +19,7 @@ let package = Package(
         .package(path: "../TracingUtils"),
         .package(url: "https://github.com/apple/swift-testing.git", branch: "0.10.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.6.0"),
+        .package(url: "https://github.com/nicklockwood/LRUCache.git", from: "1.0.7"),
     ],
     targets: [
         .target(
@@ -27,6 +28,7 @@ let package = Package(
                 "Utils",
                 "TracingUtils",
                 .product(name: "Logging", package: "swift-log"),
+                .product(name: "LRUCache", package: "LRUCache"),
             ]
         ),
         .testTarget(

PolkaVM/Sources/PolkaVM/Instruction.swift

@@ -35,7 +35,7 @@
             }
             logger.debug("execution success! updating pc...")
             return updatePC(context: context, skip: skip)
-        } catch let e as Memory.Error {
+        } catch let e as MemoryError {
             logger.debug("memory error: \(e)")
             return .exit(.pageFault(e.address))
         } catch let e {