From 29b21b818c05dc40670c7a4069633b978383f860 Mon Sep 17 00:00:00 2001 From: Michael Neumann Date: Thu, 14 Oct 2010 00:02:42 +0200 Subject: [PATCH] Replace magic numbers in pc64/apic_vector.s Similar to commit 3d911e0a2ce2b7748daa8f1d330989c970a7e150 except that we use imull instead of shll in the assembly code. --- sys/platform/pc64/apic/apic_vector.s | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/platform/pc64/apic/apic_vector.s b/sys/platform/pc64/apic/apic_vector.s index 02aa98d5d8..e83d5aa6d3 100644 --- a/sys/platform/pc64/apic/apic_vector.s +++ b/sys/platform/pc64/apic/apic_vector.s @@ -53,9 +53,10 @@ */ #define APIC_POP_FRAME POP_FRAME -/* sizeof(struct apic_intmapinfo) == 24 */ -#define IOAPICADDR(irq_num) CNAME(int_to_apicintpin) + 24 * (irq_num) + 8 -#define REDIRIDX(irq_num) CNAME(int_to_apicintpin) + 24 * (irq_num) + 16 +#define IOAPICADDR(irq_num) \ + CNAME(int_to_apicintpin) + AIMI_SIZE * (irq_num) + AIMI_APIC_ADDRESS +#define REDIRIDX(irq_num) \ + CNAME(int_to_apicintpin) + AIMI_SIZE * (irq_num) + AIMI_REDIRINDEX #define MASK_IRQ(irq_num) \ APIC_IMASK_LOCK ; /* into critical reg */ \ -- 2.41.0