VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts);
VOID __cdecl HalpApcInterrupt(VOID);
VOID __cdecl HalpDispatchInterrupt(VOID);
-VOID __cdecl HalpDispatchInterrupt2(VOID);
+PHAL_SW_INTERRUPT_HANDLER __cdecl HalpDispatchInterrupt2(VOID);
DECLSPEC_NORETURN VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame);
DECLSPEC_NORETURN VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame);
.ENDP
ENDM
+MACRO(DEFINE_INTERRUPT_WRAPPER, WrapperName, HandlerName)
+EXTERN _&HandlerName:PROC
+PUBLIC _&WrapperName
+.PROC _&WrapperName
+ FPO 0, 0, 0, 0, 0, FRAME_FPO
+
+ /* Call the C function */
+ call _&HandlerName
+
+ /* Check if we got a pointer back */
+ test eax, eax
+ jnz WrapperName&_CallIntHandler
+
+ /* No? Just return */
+ ret
+
+WrapperName&_CallIntHandler:
+ /* Optimize the tail call to avoid stack overflow */
+ jmp eax
+.ENDP
+ENDM
+
DEFINE_END_INTERRUPT_WRAPPER HalpEndSoftwareInterrupt, HalpEndSoftwareInterrupt2
DEFINE_END_INTERRUPT_WRAPPER HalEndSystemInterrupt, HalEndSystemInterrupt2
+DEFINE_INTERRUPT_WRAPPER HalpDispatchInterrupt, HalpDispatchInterrupt2
+
END
{
(PHAL_SW_INTERRUPT_HANDLER)KiUnexpectedInterrupt,
HalpApcInterrupt,
- HalpDispatchInterrupt2,
+ HalpDispatchInterrupt,
(PHAL_SW_INTERRUPT_HANDLER)KiUnexpectedInterrupt,
HalpHardwareInterrupt0,
HalpHardwareInterrupt1,
KiEoiHelper(TrapFrame);
}
-VOID
+PHAL_SW_INTERRUPT_HANDLER
__cdecl
HalpDispatchInterrupt2(VOID)
{
}
/* Now handle pending interrupt */
- SWInterruptHandlerTable[PendingIrql]();
+ return SWInterruptHandlerTable[PendingIrql];
}
+
+ return NULL;
}
#else