disable MAIN_ISR_CHAINED for it is not complete yet.

Author: crazii

main.c

@@ -31,7 +31,7 @@ PROGNAME = "SBEMU";
 #define MAIN_TRAP_PIC_ONDEMAND 1
 #define MAIN_INSTALL_RM_ISR 1 //not needed. but to workaround some rm games' problem. need RAW_HOOk in dpmi_dj2.c
 #define MAIN_DOUBLE_OPL_VOLUME 1 //hack: double the amplitude of OPL PCM. should be 1 or 0
-#define MAIN_ISR_CHAINED 1 //auto calls next handler AFTER current handler exits
+#define MAIN_ISR_CHAINED 0 //auto calls next handler AFTER current handler exits
 
 #define MAIN_TSR_INT 0x2D   //AMIS multiplex. TODO: 0x2F?
 #define MAIN_TSR_INTSTART_ID 0x01 //start id
@@ -1012,18 +1012,21 @@ static void MAIN_InterruptPM()
     //then because we're still in MAIN_InterruptPM, so MAIN_InterruptPM is never enterred agian (guarded by go32 or MAIN_ININT_PM), 
     //so the newly coming irq will never be processed and the IRQ will flood the system
     //an alternative chained methods will EXIT MAIN_InterruptPM FIRST and calls next handler, which will avoid this case, see @MAIN_ISR_CHAINED
+    //but we need a hack if the default handler in IVT doesn't send EOI or masks the irq (TODO) 
 
     //MAIN_IntContext.EFLAGS |= (MAIN_InINT&MAIN_ININT_RM) ? (MAIN_IntContext.EFLAGS&CPU_VMFLAG) : 0;
     HDPMIPT_GetInterrupContext(&MAIN_IntContext);
     if(/*!(MAIN_InINT&MAIN_ININT_RM) && */aui.card_handler->irq_routine && aui.card_handler->irq_routine(&aui)) //check if the irq belong the sound card
     {
         MAIN_Interrupt();
+        #if !MAIN_ISR_CHAINED
         PIC_SendEOIWithIRQ(aui.card_irq);
+        #endif
     }
     #if !MAIN_ISR_CHAINED
     else
     {
-        if((MAIN_InINT&MAIN_ININT_RM) || (MAIN_IntContext.EFLAGS&CPU_VMFLAG))
+        if(/*(MAIN_InINT&MAIN_ININT_RM) || */(MAIN_IntContext.EFLAGS&CPU_VMFLAG))
             DPMI_CallOldISR(&MAIN_IntHandlePM);
         else
             DPMI_CallOldISRWithContext(&MAIN_IntHandlePM, &MAIN_IntContext.regs);
@@ -1049,7 +1052,9 @@ static void MAIN_InterruptRM()
         MAIN_IntContext.regs = MAIN_RMIntREG;
         MAIN_IntContext.EFLAGS = MAIN_RMIntREG.w.flags | CPU_VMFLAG;
         MAIN_Interrupt();
+        #if !MAIN_ISR_CHAINED
         PIC_SendEOIWithIRQ(aui.card_irq);
+        #endif
     }
     #if !MAIN_ISR_CHAINED
     else

sbemu/dpmi/dpmi.h

@@ -306,7 +306,7 @@ void DPMI_HighFree(uint32_t segment);
 //convert real mode far pointer to linear addr
 #define DPMI_FP2L(f32) ((((f32)>>12)&0xFFFF0)+((f32)&0xFFFF))
 //convert far pointer (seg:off) to linear
-#define DPMI_SEGOFF2L(seg, off) ((((uint32_t)((seg)&0xFFFF))<<4) + ((off)&0xFFFF))
+#define DPMI_SEGOFF2L(seg, off) ((((uint32_t)(((uint32_t)seg)&0xFFFF))<<4) + ((off)&0xFFFF))
 //convert far pointer (seg:off) to 32bit far ptr
 #define DPMI_MKFP(seg, off) ((((uint32_t)((seg)&0xFFFF))<<16) | ((off)&0xFFFF))
 

sbemu/pic.c

@@ -23,6 +23,10 @@
 
 void PIC_SendEOIWithIRQ(uint8_t irq)
 {
+    if(PIC_GetIRQ() != irq) //not gonna happen but just incase that SMM handles a shared interrupt and we don't need send it again
+        return;             //or it's possbile that SMM only process the interrupt without sending EOI, leaving it to IVT
+                            //just make it safe
+
     if(irq == 7 || irq == 15) //check spurious irq
         return PIC_SendEOI();
     CLIS();