From: Tam Do <tdo.pro@gmail.com>
Date: Sat, 21 Jul 2018 18:40:09 +0000 (-0500)
Subject: reorder check to ensure that flag is allowed to be raised within ISR, but no nested... 
X-Git-Tag: v1.7~39^2
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=dd79f415a894fa70078e87a72cfe63b39ca2dee7;p=sx%2Fsimavr.git

reorder check to ensure that flag is allowed to be raised within ISR, but no nested IRQs occur
---

diff --git a/simavr/sim/sim_interrupts.c b/simavr/sim/sim_interrupts.c
index 68c3bff..3b97673 100644
--- a/simavr/sim/sim_interrupts.c
+++ b/simavr/sim/sim_interrupts.c
@@ -115,23 +115,25 @@ avr_raise_interrupt(
 	if (!vector || !vector->vector)
 		return 0;
 
-	if (vector->pending) {
-		if (vector->trace)
-			printf("IRQ%d:I=%d already raised (enabled %d) (cycle %lld pc 0x%x)\n",
-				vector->vector, !!avr->sreg[S_I], avr_regbit_get(avr, vector->enable),
-				(long long int)avr->cycle, avr->pc);
-        // no return - polling ISR within interrupt allowed
-	}
-
 	if (vector->trace)
 		printf("IRQ%d raising (enabled %d)\n",
 			vector->vector, avr_regbit_get(avr, vector->enable));
+
 	// always mark the 'raised' flag to one, even if the interrupt is disabled
 	// this allow "polling" for the "raised" flag, like for non-interrupt
 	// driven UART and so so. These flags are often "write one to clear"
 	if (vector->raised.reg)
 		avr_regbit_set(avr, vector->raised);
 
+	if (vector->pending) {
+		if (vector->trace)
+			printf("IRQ%d:I=%d already raised (enabled %d) (cycle %lld pc 0x%x)\n",
+				vector->vector, !!avr->sreg[S_I], avr_regbit_get(avr, vector->enable),
+				(long long int)avr->cycle, avr->pc);
+
+        return 0;
+	}
+
 	avr_raise_irq(vector->irq + AVR_INT_IRQ_PENDING, 1);
 	avr_raise_irq(avr->interrupts.irq + AVR_INT_IRQ_PENDING, 1);