Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-22 21:58:57 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixed INT0 & INT1 interrupt line handling

Browse Source
This commit is contained in:
Couriersud 2008-10-29 21:58:19 +00:00
parent a9afec7df4
commit e60a8d7bfe
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/emu/cpu/i8051/i8051.c
View File

@ -867,7 +867,7 @@ INLINE void update_timer_t0(int cycles)
TL0 = count & 0xff; TL0 = count & 0xff;
break; break;
case 2: /* 8 Bit Autoreload */ case 2: /* 8 Bit Autoreload */
count = (UINT32) TL0 + delta; count = ((UINT32) TL0) + delta;
if ( count & 0xffffff00 ) /* Check for overflow */ if ( count & 0xffffff00 ) /* Check for overflow */
{ {
SET_TF0(1); SET_TF0(1);
@ -878,7 +878,7 @@ INLINE void update_timer_t0(int cycles)
break; break;
case 3: case 3:
/* Split Timer 1 */ /* Split Timer 1 */
count = (UINT16) TL0 + delta; count = ((UINT32) TL0) + delta;
if ( count & 0xffffff00 ) /* Check for overflow */ if ( count & 0xffffff00 ) /* Check for overflow */
SET_TF0(1); SET_TF0(1);
TL0 = count & 0xff; /* Update new values of the counter */ TL0 = count & 0xff; /* Update new values of the counter */
@ -891,7 +891,7 @@ INLINE void update_timer_t0(int cycles)
{ {
case 3: case 3:
/* Split Timer 2 */ /* Split Timer 2 */
count = (UINT16) TH0 + cycles; /* No gate control or counting !*/ count = ((UINT32) TH0) + cycles; /* No gate control or counting !*/
if ( count & 0xffffff00 ) /* Check for overflow */ if ( count & 0xffffff00 ) /* Check for overflow */
SET_TF1(1); SET_TF1(1);
TH0 = count & 0xff; /* Update new values of the counter */ TH0 = count & 0xff; /* Update new values of the counter */
@ -909,7 +909,7 @@ INLINE void update_timer_t1(int cycles)
if (GET_TR1) if (GET_TR1)
{ {
UINT32 delta; UINT32 delta;
int overflow = 0; UINT32 overflow = 0;
/* counter / external input */ /* counter / external input */
delta = GET_CT1 ? mcs51.t1_cnt : cycles; delta = GET_CT1 ? mcs51.t1_cnt : cycles;
@ -938,7 +938,7 @@ INLINE void update_timer_t1(int cycles)
TL1 = count & 0xff; TL1 = count & 0xff;
break; break;
case 2: /* 8 Bit Autoreload */ case 2: /* 8 Bit Autoreload */
count = (UINT32) TL1 + delta; count = ((UINT32) TL1) + delta;
overflow = count & 0xffffff00; /* Check for overflow */ overflow = count & 0xffffff00; /* Check for overflow */
if ( overflow ) if ( overflow )
{ {
@ -1020,8 +1020,6 @@ INLINE void update_timer_t2(int cycles)
INLINE void update_timers(int cycles) INLINE void update_timers(int cycles)
{ {
if (cycles == 0)
return; /* nothing to do */
/* Update Timer 0 */ /* Update Timer 0 */
update_timer_t0(cycles); update_timer_t0(cycles);
update_timer_t1(cycles); update_timer_t1(cycles);
@ -1623,8 +1621,6 @@ static void mcs51_set_irq_line(int irqline, int state)
case I8051_INT0_LINE: case I8051_INT0_LINE:
//Line Asserted? //Line Asserted?
if (state != CLEAR_LINE) { if (state != CLEAR_LINE) {
//Is the enable flag for this interrupt set?
if (GET_EX0) {
//Need cleared->active line transition? (Logical 1-0 Pulse on the line) - CLEAR->ASSERT Transition since INT0 active lo! //Need cleared->active line transition? (Logical 1-0 Pulse on the line) - CLEAR->ASSERT Transition since INT0 active lo!
if (GET_IT0) { if (GET_IT0) {
if (GET_BIT(tr_state, I8051_INT0_LINE)) if (GET_BIT(tr_state, I8051_INT0_LINE))
@ -1633,7 +1629,6 @@ static void mcs51_set_irq_line(int irqline, int state)
else else
SET_IE0(1); //Nope, just set it.. SET_IE0(1); //Nope, just set it..
} }
}
else else
{ {
if (!GET_IT0) /* clear if level triggered */ if (!GET_IT0) /* clear if level triggered */
@ -1647,7 +1642,6 @@ static void mcs51_set_irq_line(int irqline, int state)
//Line Asserted? //Line Asserted?
if (state != CLEAR_LINE) { if (state != CLEAR_LINE) {
if(GET_EX1) {
//Need cleared->active line transition? (Logical 1-0 Pulse on the line) - CLEAR->ASSERT Transition since INT1 active lo! //Need cleared->active line transition? (Logical 1-0 Pulse on the line) - CLEAR->ASSERT Transition since INT1 active lo!
if(GET_IT1){ if(GET_IT1){
if (GET_BIT(tr_state, I8051_INT1_LINE)) if (GET_BIT(tr_state, I8051_INT1_LINE))
@ -1656,7 +1650,6 @@ static void mcs51_set_irq_line(int irqline, int state)
else else
SET_IE1(1); //Nope, just set it.. SET_IE1(1); //Nope, just set it..
} }
}
else else
{ {
if (!GET_IT1) /* clear if level triggered */ if (!GET_IT1) /* clear if level triggered */
@ -1687,7 +1680,6 @@ static void mcs51_set_irq_line(int irqline, int state)
case MCS51_T2EX_LINE: case MCS51_T2EX_LINE:
if (mcs51.features & FEATURE_I8052) if (mcs51.features & FEATURE_I8052)
{ {
if (GET_TR2 && GET_EXEN2)
if (GET_BIT(tr_state, MCS51_T2EX_LINE)) if (GET_BIT(tr_state, MCS51_T2EX_LINE))
{ {
SET_EXF2(1); SET_EXF2(1);