Break out into function

Author: emanuelen5

simavr/sim/sim_interrupts.c

@@ -227,6 +227,20 @@ avr_interrupt_reti(
 					table->running[table->running_ptr-1]->vector : 0);
 }
 
+static int interrupt_table_offset(avr_t *avr)
+{
+	const int mcucr = _SFR_IO8(0x35);
+	const int ivsel = 1;
+	const char interrupt_sector_moved_to_bootloader = avr->data[mcucr] & (1 << ivsel);
+
+	const int bootloader_size = 0x800;
+
+	if (interrupt_sector_moved_to_bootloader)
+		return avr->flashend - bootloader_size + 1;
+
+	return 0;
+}
+
 /*
  * check whether interrupts are pending. If so, check if the interrupt "latency" is reached,
  * and if so triggers the handlers and jump to the vector.
@@ -282,13 +296,7 @@ avr_service_interrupts(
 			printf("IRQ%d calling\n", vector->vector);
 		_avr_push_addr(avr, avr->pc);
 		avr_sreg_set(avr, S_I, 0);
-		const int mcucr = _SFR_IO8(0x35);
-		const int ivsel = 1;
-		const char interrupt_sector_moved_to_bootloader = avr->data[mcucr] & (1 << ivsel);
-		if (interrupt_sector_moved_to_bootloader)
-			avr->pc = vector->vector * avr->vector_size + 0x7000;
-		else
-			avr->pc = vector->vector * avr->vector_size;
+		avr->pc = vector->vector * avr->vector_size + interrupt_table_offset(avr);
 
 		avr_raise_irq(vector->irq + AVR_INT_IRQ_RUNNING, 1);
 		avr_raise_irq(table->irq + AVR_INT_IRQ_RUNNING, vector->vector);