Conditional breakpoint support for Lua 5.4

WheretIB · WheretIB · commit 1b054dc2fa3a · 2020-07-07T00:22:19.000+03:00
diff --git a/LuaDkmDebuggerComponent/RemoteComponent.cs b/LuaDkmDebuggerComponent/RemoteComponent.cs
@@ -639,7 +639,6 @@ void IDkmLanguageConditionEvaluator.EvaluateCondition(DkmEvaluationBreakpointCon
                 DebugHelpers.SkipStructPointer(process, ref temp); // top
                 DebugHelpers.SkipStructPointer(process, ref temp); // l_G
                 callInfoAddress = DebugHelpers.ReadStructPointer(process, ref temp).GetValueOrDefault(0);
-
             }
             else if (processData.luaVersion == 503)
             {
@@ -649,6 +648,15 @@ void IDkmLanguageConditionEvaluator.EvaluateCondition(DkmEvaluationBreakpointCon
                 DebugHelpers.SkipStructPointer(process, ref temp); // l_G
                 callInfoAddress = DebugHelpers.ReadStructPointer(process, ref temp).GetValueOrDefault(0);
             }
+            else if (processData.luaVersion == 504)
+            {
+                DebugHelpers.SkipStructByte(process, ref temp); // status
+                DebugHelpers.SkipStructByte(process, ref temp); // allowhook
+                DebugHelpers.SkipStructShort(process, ref temp); // nci
+                DebugHelpers.SkipStructPointer(process, ref temp); // top
+                DebugHelpers.SkipStructPointer(process, ref temp); // l_G
+                callInfoAddress = DebugHelpers.ReadStructPointer(process, ref temp).GetValueOrDefault(0);
+            }
 
             if (callInfoAddress == 0)
             {

Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,6 @@ void IDkmLanguageConditionEvaluator.EvaluateCondition(DkmEvaluationBreakpointCon`
`639`	`639`	`DebugHelpers.SkipStructPointer(process, ref temp); // top`
`640`	`640`	`DebugHelpers.SkipStructPointer(process, ref temp); // l_G`
`641`	`641`	`callInfoAddress = DebugHelpers.ReadStructPointer(process, ref temp).GetValueOrDefault(0);`
`642`		`-`
`643`	`642`	`}`
`644`	`643`	`else if (processData.luaVersion == 503)`
`645`	`644`	`{`
`@@ -649,6 +648,15 @@ void IDkmLanguageConditionEvaluator.EvaluateCondition(DkmEvaluationBreakpointCon`
`649`	`648`	`DebugHelpers.SkipStructPointer(process, ref temp); // l_G`
`650`	`649`	`callInfoAddress = DebugHelpers.ReadStructPointer(process, ref temp).GetValueOrDefault(0);`
`651`	`650`	`}`
	`651`	`+ else if (processData.luaVersion == 504)`
	`652`	`+ {`
	`653`	`+ DebugHelpers.SkipStructByte(process, ref temp); // status`
	`654`	`+ DebugHelpers.SkipStructByte(process, ref temp); // allowhook`
	`655`	`+ DebugHelpers.SkipStructShort(process, ref temp); // nci`
	`656`	`+ DebugHelpers.SkipStructPointer(process, ref temp); // top`
	`657`	`+ DebugHelpers.SkipStructPointer(process, ref temp); // l_G`
	`658`	`+ callInfoAddress = DebugHelpers.ReadStructPointer(process, ref temp).GetValueOrDefault(0);`
	`659`	`+ }`
`652`	`660`
`653`	`661`	`if (callInfoAddress == 0)`
`654`	`662`	`{`