@@ -126,11 +126,11 @@ private static Span<byte> Alloc(ReadOnlySpan<byte> bytes, out IntPtr ptr)
126126 var asmSpan = Alloc ( PanicAsmBytes , out var asmPtr ) ;
127127
128128 var returnAddr = asmPtr + 0x1A ;
129- MemoryMarshal . Write ( asmSpan [ 3 ..] , ref returnAddr ) ;
129+ MemoryMarshal . Write ( asmSpan [ 3 ..] , in returnAddr ) ;
130130
131131 RuntimeHelpers . PrepareMethod ( panicMethodHandle ) ;
132132 var panicPtr = panicMethodHandle . GetFunctionPointer ( ) ;
133- MemoryMarshal . Write ( asmSpan [ 18 ..] , ref panicPtr ) ;
133+ MemoryMarshal . Write ( asmSpan [ 18 ..] , in panicPtr ) ;
134134
135135#if TRACE_PANIC
136136 // Console.WriteLine("Stack State at 0x{0:X}", (IntPtr) stackState);
@@ -232,13 +232,13 @@ static IntPtr PrepareHookAsm(IntPtr export, IntPtr throwPanicExceptionPtr)
232232 var asmSpan = Alloc ( HookAsmBytes , out var asmPtr ) ;
233233
234234 var panicJmpAddr = asmPtr + 202 + 10 + 216 * 2 + 136 + 50 + 19 ;
235- MemoryMarshal . Write ( asmSpan . Slice ( 29 + 216 ) , ref panicJmpAddr ) ;
236- MemoryMarshal . Write ( asmSpan . Slice ( 29 + 10 + 216 ) , ref panicJmpAddr ) ;
237- MemoryMarshal . Write ( asmSpan . Slice ( 45 + 10 + 216 ) , ref mPtr ) ;
238- MemoryMarshal . Write ( asmSpan . Slice ( 533 ) , ref export ) ;
239- MemoryMarshal . Write ( asmSpan . Slice ( 161 + 10 + 216 * 2 + 136 + 50 + 19 ) , ref export ) ;
240- MemoryMarshal . Write ( asmSpan . Slice ( 188 + 10 + 216 * 2 + 136 + 50 + 19 ) , ref popPanicPtr ) ;
241- MemoryMarshal . Write ( asmSpan . Slice ( 275 + 10 + 216 * 2 + 136 * 2 + 50 + 19 ) , ref throwPanicExceptionPtr ) ;
235+ MemoryMarshal . Write ( asmSpan . Slice ( 29 + 216 ) , in panicJmpAddr ) ;
236+ MemoryMarshal . Write ( asmSpan . Slice ( 29 + 10 + 216 ) , in panicJmpAddr ) ;
237+ MemoryMarshal . Write ( asmSpan . Slice ( 45 + 10 + 216 ) , in mPtr ) ;
238+ MemoryMarshal . Write ( asmSpan . Slice ( 533 ) , in export ) ;
239+ MemoryMarshal . Write ( asmSpan . Slice ( 161 + 10 + 216 * 2 + 136 + 50 + 19 ) , in export ) ;
240+ MemoryMarshal . Write ( asmSpan . Slice ( 188 + 10 + 216 * 2 + 136 + 50 + 19 ) , in popPanicPtr ) ;
241+ MemoryMarshal . Write ( asmSpan . Slice ( 275 + 10 + 216 * 2 + 136 * 2 + 50 + 19 ) , in throwPanicExceptionPtr ) ;
242242
243243#if TRACE_PANIC
244244 Console . WriteLine ( "SetPanicJump: 0x{0:X}\n lua_error hook 1: 0x{1:X}\n longjmp panic addr: 0x{2:X}\n popPanicPtr: 0x{3:X}\n throwPanicExceptionPtr: 0x{4:X}" , mPtr , asmPtr , panicJmpAddr , popPanicPtr , throwPanicExceptionPtr ) ;
0 commit comments