Tweaks, seems to be running now

wiremod · Aug 14, 2024 · 790d51d · 790d51d
1 parent 692b56d
commit 790d51d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/lua/wire/zvm/zvm_core.lua b/lua/wire/zvm/zvm_core.lua
@@ -469,15 +469,14 @@ function ZVM:Precompile_Step()
       self:Emit("end")
     local expectedPage = self:GetPageByIndex(math.floor(self.PrecompileXEIP/128))
     if expectedPage.MappedIndex ~= math.floor(expectedPage.MappedIndex) then
-      -- Bad address, send out an invalid address interrupt if this gets executed(it probably will)
+      -- Bad address because MappedIndex is a float, send out an invalid address interrupt if this gets executed(it probably will in a sec)
       self:Dyn_EmitInterrupt(15,expectedPage.MappedIndex*128)
     end
-    self:Emit("if (VM.CurrentPage.Remapped) and (VM.CurrentPage.MappedIndex ~= %d) then",expectedPage.MappedIndex)
-        -- This page wasn't the expected continuation, we should invalidate this address. (force recompile at this point)
-        self:Emit("VM:InvalidateVirtualPrecompileAddress(VM.XEIP)")
-        -- self:Emit("print(\"Expected page %d got page \"..VM.CurrentPage.MappedIndex)",expectedPage.MappedIndex)
-        self:Dyn_EmitBreak(true)
-      self:Emit("end")
+    self:Emit("end")
+    self:Emit("if (VM.CurrentPage.MappedIndex ~= %d) then",expectedPage.MappedIndex)
+      -- This page wasn't the expected continuation, we should invalidate this address. (force recompile at this point)
+      self:Emit("VM:InvalidateVirtualPrecompileAddress(VM.XEIP)")
+      self:Dyn_EmitBreak(true)
     self:Emit("end")
     self:Emit("VM:SetPreviousPage(%d)",math.floor(self.PrecompileXEIP/128))
 

diff --git a/lua/wire/zvm/zvm_opcodes.lua b/lua/wire/zvm/zvm_opcodes.lua
@@ -1206,12 +1206,7 @@ ZVM.OpcodeTable[131] = function(self)  --SMAP
       self:Dyn_EmitInterruptCheck()
 
       self:Dyn_Emit("for address=IDX*128,IDX*128+127 do")
-        self:Dyn_Emit("if VM.IsAddressPrecompiled[address] then")
-          self:Dyn_Emit("for k,v in ipairs(VM.IsAddressPrecompiled[address]) do")
-            self:Dyn_Emit("VM.PrecompiledData[v] = nil")
-            self:Dyn_Emit("VM.IsAddressPrecompiled[address][k] = nil")
-          self:Dyn_Emit("end")
-        self:Dyn_Emit("end")
+        self:Dyn_Emit("VM:InvalidateVirtualPrecompileAddress(address)")
       self:Dyn_Emit("end")
     self:Dyn_Emit("else")
       self:Dyn_EmitInterrupt("11","IDX")