Execute prepared calls with the exact thread-local machine

fwsGonzo · fwsGonzo · commit 4a0dc388ce02 · 2024-06-20T19:28:07.000+02:00
diff --git a/engine/src/script/event.hpp b/engine/src/script/event.hpp
@@ -58,7 +58,7 @@ struct Event
 
 template <typename F, EventUsagePattern Usage>
 inline Event<F, Usage>::Event(Script& script, Script::gaddr_t address)
-  : m_pcall((Usage == SharedScript) ? script.machine() : script.get_fork().machine(), address)
+  : m_pcall(script.machine(), address)
 {
 }
 
diff --git a/engine/src/script/script.hpp b/engine/src/script/script.hpp
@@ -383,7 +383,7 @@ inline std::optional<Script::sgaddr_t> Script::prepared_call(riscv::PreparedCall
 	try
 	{
 		if (LIKELY(meter.is_one()))
-			return {pcall.vmcall(std::forward<Args>(args)...)};
+			return {pcall.call_with(*m_machine, std::forward<Args>(args)...)};
 		else if (LIKELY(meter.get() < MAX_CALL_DEPTH))
 			return {machine().preempt(MAX_CALL_INSTR, pcall.address(),
 				std::forward<Args>(args)...)};
diff --git a/ext/libriscv b/ext/libriscv
@@ -1 +1 @@
-Subproject commit ec545fbb505f089d953e72bded1249bebd3ad1b8
+Subproject commit cc81d19fd46d31325b8cef8586609c82bc9938e2

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ struct Event`
`58`	`58`
`59`	`59`	`template <typename F, EventUsagePattern Usage>`
`60`	`60`	`inline Event<F, Usage>::Event(Script& script, Script::gaddr_t address)`
`61`		`- : m_pcall((Usage == SharedScript) ? script.machine() : script.get_fork().machine(), address)`
	`61`	`+ : m_pcall(script.machine(), address)`
`62`	`62`	`{`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ inline std::optional<Script::sgaddr_t> Script::prepared_call(riscv::PreparedCall`
`383`	`383`	`try`
`384`	`384`	`{`
`385`	`385`	`if (LIKELY(meter.is_one()))`
`386`		`- return {pcall.vmcall(std::forward<Args>(args)...)};`
	`386`	`+ return {pcall.call_with(*m_machine, std::forward<Args>(args)...)};`
`387`	`387`	`else if (LIKELY(meter.get() < MAX_CALL_DEPTH))`
`388`	`388`	`return {machine().preempt(MAX_CALL_INSTR, pcall.address(),`
`389`	`389`	`std::forward<Args>(args)...)};`