diff --git a/src/arch/x86_64/idt.rs b/src/arch/x86_64/idt.rs
index c3c5d311ce..1ea5e1b906 100644
--- a/src/arch/x86_64/idt.rs
+++ b/src/arch/x86_64/idt.rs
@@ -9,6 +9,7 @@ use x86::segmentation::Descriptor as X86IdtEntry;
 use x86::dtables::{self, DescriptorTablePointer};
 
 use crate::{interrupt::*, LogicalCpuId};
+use crate::interrupt::irq::{__generic_interrupts_end, __generic_interrupts_start};
 use crate::ipi::IpiKind;
 
 use spin::RwLock;
@@ -101,19 +102,6 @@ pub fn available_irqs_iter(cpu_id: LogicalCpuId) -> impl Iterator<Item = u8> + '
     (32..=254).filter(move |&index| !is_reserved(cpu_id, index))
 }
 
-macro_rules! use_irq(
-    ( $idt: expr, $number:literal, $func:ident ) => {{
-        $idt[$number].set_func($func);
-    }}
-);
-
-macro_rules! use_default_irqs(
-    ($idt:expr) => {{
-        use crate::interrupt::irq::*;
-        default_irqs!($idt, use_irq);
-    }}
-);
-
 pub unsafe fn init() {
     dtables::lidt(&INIT_IDTR);
 }
@@ -211,6 +199,12 @@ pub unsafe fn init_generic(is_bsp: bool, idt: &mut Idt) {
     current_idt[30].set_func(exception::security);
     // 31 reserved
 
+    assert_eq!(__generic_interrupts_end as usize - __generic_interrupts_start as usize, 224 * 8);
+
+    for i in 0..224 {
+        current_idt[i + 32].set_func(mem::transmute(__generic_interrupts_start as usize + i * 8));
+    }
+
     // reserve bits 31:0, i.e. the first 32 interrupts, which are reserved for exceptions
     *current_reservations[0].get_mut() |= 0x0000_0000_FFFF_FFFF;
 
@@ -235,7 +229,6 @@ pub unsafe fn init_generic(is_bsp: bool, idt: &mut Idt) {
         current_idt[48].set_func(irq::lapic_timer);
         current_idt[49].set_func(irq::lapic_error);
 
-
         // reserve bits 49:32, which are for the standard IRQs, and for the local apic timer and error.
         *current_reservations[0].get_mut() |= 0x0003_FFFF_0000_0000;
     } else {
@@ -246,8 +239,6 @@ pub unsafe fn init_generic(is_bsp: bool, idt: &mut Idt) {
         *current_reservations[0].get_mut() |= 1 << 49;
     }
 
-    use_default_irqs!(current_idt);
-
     // Set IPI handlers
     current_idt[IpiKind::Wakeup as usize].set_func(ipi::wakeup);
     current_idt[IpiKind::Switch as usize].set_func(ipi::switch);
diff --git a/src/arch/x86_64/interrupt/irq.rs b/src/arch/x86_64/interrupt/irq.rs
index ff944568a0..a61bb62c50 100644
--- a/src/arch/x86_64/interrupt/irq.rs
+++ b/src/arch/x86_64/interrupt/irq.rs
@@ -258,26 +258,31 @@ interrupt!(lapic_error, || {
     lapic_eoi();
 });
 
-interrupt!(calib_pit, || {
-    {
-        *time::OFFSET.lock() += pit::RATE;
-    }
+interrupt_error!(generic_irq, |stack, code| {
+    // The reason why 128 is subtracted and added from the code, is that PUSH imm8 sign-extends the
+    // value, and the longer PUSH imm32 would make the generic_interrupts table twice as large
+    // (containing lots of useless NOPs).
+    irq_trigger((code as i32).wrapping_add(128) as u8);
 
-    eoi(0);
-});
-// XXX: This would look way prettier using const generics.
-
-macro_rules! allocatable_irq(
-    ( $idt:expr, $number:literal, $name:ident ) => {
-        interrupt!($name, || {
-            allocatable_irq_generic($number);
-        });
-    }
-);
-
-pub unsafe fn allocatable_irq_generic(number: u8) {
-    irq_trigger(number - 32);
     lapic_eoi();
-}
+});
 
-define_default_irqs!();
+core::arch::global_asm!("
+    .globl __generic_interrupts_start
+    .globl __generic_interrupts_end
+    .p2align 3
+__generic_interrupts_start:
+    n = 0
+    .rept 224
+    push (n - 128)
+    jmp {}
+    .p2align 3
+    n = n + 1
+    .endr
+__generic_interrupts_end:
+", sym generic_irq);
+
+extern "C" {
+    pub fn __generic_interrupts_start();
+    pub fn __generic_interrupts_end();
+}
diff --git a/src/arch/x86_64/macros.rs b/src/arch/x86_64/macros.rs
index 5f888cb082..4e3566fc55 100644
--- a/src/arch/x86_64/macros.rs
+++ b/src/arch/x86_64/macros.rs
@@ -14,56 +14,3 @@ macro_rules! println {
     ($fmt:expr) => (print!(concat!($fmt, "\n")));
     ($fmt:expr, $($arg:tt)*) => (print!(concat!($fmt, "\n"), $($arg)*));
 }
-
-#[macro_export]
-macro_rules! irqs(
-    ( [ $( ($idt:expr, $number:literal, $name:ident) ,)* ], $submac:ident ) => {
-        $(
-            $submac!($idt, $number, $name);
-        )*
-    }
-);
-
-// define the irq numbers specified in the list above, as functions of the names
-// allocatable_irq_NUM.
-#[macro_export]
-macro_rules! default_irqs(
-    ($idt:expr, $submac:ident) => {
-        irqs!([
-            // interrupt vectors below 32 are exceptions
-            // vectors 32..=47 are used for standard 8259 pic irqs.
-            // 48 and 49 are used for the local APIC timer and error register, respectively.
-            ($idt, 50, irq_50), ($idt, 51, irq_51), ($idt, 52, irq_52), ($idt, 53, irq_53), ($idt, 54, irq_54), ($idt, 55, irq_55), ($idt, 56, irq_56), ($idt, 57, irq_57), ($idt, 58, irq_58), ($idt, 59, irq_59),
-            ($idt, 60, irq_60), ($idt, 61, irq_61), ($idt, 62, irq_62), ($idt, 63, irq_63),
-            // 64..=67 used for IPI
-            ($idt, 68, irq_68), ($idt, 69, irq_69),
-            ($idt, 70, irq_70), ($idt, 71, irq_71), ($idt, 72, irq_72), ($idt, 73, irq_73), ($idt, 74, irq_74), ($idt, 75, irq_75), ($idt, 76, irq_76), ($idt, 77, irq_77), ($idt, 78, irq_78), ($idt, 79, irq_79),
-            ($idt, 80, irq_80), ($idt, 81, irq_81), ($idt, 82, irq_82), ($idt, 83, irq_83), ($idt, 84, irq_84), ($idt, 85, irq_85), ($idt, 86, irq_86), ($idt, 87, irq_87), ($idt, 88, irq_88), ($idt, 89, irq_89),
-            ($idt, 90, irq_90), ($idt, 91, irq_91), ($idt, 92, irq_92), ($idt, 93, irq_93), ($idt, 94, irq_94), ($idt, 95, irq_95), ($idt, 96, irq_96), ($idt, 97, irq_97), ($idt, 98, irq_98), ($idt, 99, irq_99),
-            ($idt, 100, irq_100), ($idt, 101, irq_101), ($idt, 102, irq_102), ($idt, 103, irq_103), ($idt, 104, irq_104), ($idt, 105, irq_105), ($idt, 106, irq_106), ($idt, 107, irq_107), ($idt, 108, irq_108), ($idt, 109, irq_109),
-            ($idt, 110, irq_110), ($idt, 111, irq_111), ($idt, 112, irq_112), ($idt, 113, irq_113), ($idt, 114, irq_114), ($idt, 115, irq_115), ($idt, 116, irq_116), ($idt, 117, irq_117), ($idt, 118, irq_118), ($idt, 119, irq_119),
-            ($idt, 120, irq_120), ($idt, 121, irq_121), ($idt, 122, irq_122), ($idt, 123, irq_123), ($idt, 124, irq_124), ($idt, 125, irq_125), ($idt, 126, irq_126), ($idt, 127, irq_127),
-            // 128 is used for software interrupts
-            ($idt, 129, irq_129),
-            ($idt, 130, irq_130), ($idt, 131, irq_131), ($idt, 132, irq_132), ($idt, 133, irq_133), ($idt, 134, irq_134), ($idt, 135, irq_135), ($idt, 136, irq_136), ($idt, 137, irq_137), ($idt, 138, irq_138), ($idt, 139, irq_139),
-            ($idt, 140, irq_140), ($idt, 141, irq_141), ($idt, 142, irq_142), ($idt, 143, irq_143), ($idt, 144, irq_144), ($idt, 145, irq_145), ($idt, 146, irq_146), ($idt, 147, irq_147), ($idt, 148, irq_148), ($idt, 149, irq_149),
-            ($idt, 150, irq_150), ($idt, 151, irq_151), ($idt, 152, irq_152), ($idt, 153, irq_153), ($idt, 154, irq_154), ($idt, 155, irq_155), ($idt, 156, irq_156), ($idt, 157, irq_157), ($idt, 158, irq_158), ($idt, 159, irq_159),
-            ($idt, 160, irq_160), ($idt, 161, irq_161), ($idt, 162, irq_162), ($idt, 163, irq_163), ($idt, 164, irq_164), ($idt, 165, irq_165), ($idt, 166, irq_166), ($idt, 167, irq_167), ($idt, 168, irq_168), ($idt, 169, irq_169),
-            ($idt, 170, irq_170), ($idt, 171, irq_171), ($idt, 172, irq_172), ($idt, 173, irq_173), ($idt, 174, irq_174), ($idt, 175, irq_175), ($idt, 176, irq_176), ($idt, 177, irq_177), ($idt, 178, irq_178), ($idt, 179, irq_179),
-            ($idt, 180, irq_180), ($idt, 181, irq_181), ($idt, 182, irq_182), ($idt, 183, irq_183), ($idt, 184, irq_184), ($idt, 185, irq_185), ($idt, 186, irq_186), ($idt, 187, irq_187), ($idt, 188, irq_188), ($idt, 189, irq_189),
-            ($idt, 190, irq_190), ($idt, 191, irq_191), ($idt, 192, irq_192), ($idt, 193, irq_193), ($idt, 194, irq_194), ($idt, 195, irq_195), ($idt, 196, irq_196), ($idt, 197, irq_197), ($idt, 198, irq_198), ($idt, 199, irq_199),
-            ($idt, 200, irq_200), ($idt, 201, irq_201), ($idt, 202, irq_202), ($idt, 203, irq_203), ($idt, 204, irq_204), ($idt, 205, irq_205), ($idt, 206, irq_206), ($idt, 207, irq_207), ($idt, 208, irq_208), ($idt, 209, irq_209),
-            ($idt, 210, irq_210), ($idt, 211, irq_211), ($idt, 212, irq_212), ($idt, 213, irq_213), ($idt, 214, irq_214), ($idt, 215, irq_215), ($idt, 216, irq_216), ($idt, 217, irq_217), ($idt, 218, irq_218), ($idt, 219, irq_219),
-            ($idt, 220, irq_220), ($idt, 221, irq_221), ($idt, 222, irq_222), ($idt, 223, irq_223), ($idt, 224, irq_224), ($idt, 225, irq_225), ($idt, 226, irq_226), ($idt, 227, irq_227), ($idt, 228, irq_228), ($idt, 229, irq_229),
-            ($idt, 230, irq_230), ($idt, 231, irq_231), ($idt, 232, irq_232), ($idt, 233, irq_233), ($idt, 234, irq_234), ($idt, 235, irq_235), ($idt, 236, irq_236), ($idt, 237, irq_237), ($idt, 238, irq_238), ($idt, 239, irq_239),
-            ($idt, 240, irq_240), ($idt, 241, irq_241), ($idt, 242, irq_242), ($idt, 243, irq_243), ($idt, 244, irq_244), ($idt, 245, irq_245), ($idt, 246, irq_246), ($idt, 247, irq_247), ($idt, 248, irq_248), ($idt, 249, irq_249),
-            ($idt, 250, irq_250), ($idt, 251, irq_251), ($idt, 252, irq_252), ($idt, 253, irq_253), ($idt, 254, irq_254), ($idt, 255, irq_255),
-        ], $submac);
-    }
-);
-
-macro_rules! define_default_irqs(
-    () => {
-        default_irqs!((), allocatable_irq);
-    }
-);