Merge branch 'master' into memmgr

xtoskrnl/includes/ar/amd64/assembly.hh

@@ -15,9 +15,14 @@
 /* TrampolineEnableXpa end address to calculate trampoline size */
 XTCLINK PVOID ArEnableExtendedPhysicalAddressingEnd[];
 
+/* External array of pointers to the interrupt handlers */
+XTCLINK ULONG_PTR ArInterruptEntry[256];
+
 /* TrampolineApStartup end address to calculate trampoline size */
 XTCLINK PVOID ArStartApplicationProcessorEnd[];
 
+/* External array of pointers to the trap handlers */
+XTCLINK ULONG_PTR ArTrapEntry[256];
 
 /* Forward reference for assembler code */
 XTCLINK
@@ -30,129 +35,4 @@ XTCDECL
 VOID
 ArStartApplicationProcessor(VOID);
 
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x00(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x01(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x02(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x03(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x04(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x05(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x06(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x07(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x08(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x09(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0A(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0B(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0C(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0D(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0E(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x10(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x11(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x12(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x13(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x1F(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x2C(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x2D(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x2F(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0xE1(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0xFF(VOID);
-
 #endif /* __XTOSKRNL_AR_ASSEMBLY_HH */

xtoskrnl/includes/ar/i686/assembly.hh

@@ -12,9 +12,14 @@
 #include <xtos.hh>
 
 
+/* External array of pointers to the interrupt handlers */
+XTCLINK ULONG_PTR ArInterruptEntry[256];
+
 /* TrampolineApStartup end address to calculate trampoline size */
 XTCLINK PVOID ArStartApplicationProcessorEnd[];
 
+/* External array of pointers to the trap handlers */
+XTCLINK ULONG_PTR ArTrapEntry[256];
 
 /* Forward reference for assembler code */
 XTCLINK
@@ -22,130 +27,4 @@ XTCDECL
 VOID
 ArStartApplicationProcessor(VOID);
 
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x00(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x01(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x02(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x03(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x04(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x05(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x06(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x07(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x08(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x09(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0A(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0B(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0C(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0D(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x0E(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x10(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x11(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x12(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x13(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x2A(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x2B(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x2C(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x2D(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0x2E(VOID);
-
-XTCLINK
-XTCDECL
-VOID
-ArTrap0xFF(VOID);
-
-
 #endif /* __XTOSKRNL_AR_ASSEMBLY_HH */

xtoskrnl/includes/hl.hh

@@ -18,6 +18,7 @@
 #include <hl/init.hh>
 #include <hl/ioport.hh>
 #include <hl/ioreg.hh>
+#include <hl/irq.hh>
 #include <hl/pic.hh>
 #include <hl/runlevel.hh>
 

xtoskrnl/includes/hl/irq.hh

@@ -1,19 +1,19 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/ke/irq.hh
- * DESCRIPTION:     Kernel interrupts support
+ * FILE:            xtoskrnl/includes/hl/irq.hh
+ * DESCRIPTION:     Interrupts support
  * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
  */
 
-#ifndef __XTOSKRNL_KE_IRQ_HH
-#define __XTOSKRNL_KE_IRQ_HH
+#ifndef __XTOSKRNL_HL_IRQ_HH
+#define __XTOSKRNL_HL_IRQ_HH
 
 #include <xtos.hh>
 
 
-/* Kernel Library */
-namespace KE
+/* Hardware Layer */
+namespace HL
 {
     class Irq
     {
@@ -23,4 +23,4 @@ namespace KE
     };
 }
 
-#endif /* __XTOSKRNL_KE_IRQ_HH */
+#endif /* __XTOSKRNL_HL_IRQ_HH */

xtoskrnl/includes/ke.hh

@@ -17,7 +17,6 @@
 #include <ke/dpc.hh>
 #include <ke/event.hh>
 #include <ke/guard.hh>
-#include <ke/irq.hh>
 #include <ke/kprocess.hh>
 #include <ke/krnlinit.hh>
 #include <ke/kthread.hh>

xtoskrnl/includes/ke/info.hh

@@ -1,27 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/ke/info.hh
- * DESCRIPTION:     Generic kernel information support
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-#ifndef __XTOSKRNL_KE_INFO_HH
-#define __XTOSKRNL_KE_INFO_HH
-
-#include <xtos.hh>
-
-
-/* Kernel Library */
-namespace KE
-{
-    class Info
-    {
-        public:
-            STATIC XTAPI SYSTEM_FIRMWARE_TYPE GetFirmwareType(VOID);
-            STATIC XTAPI XTSTATUS GetKernelParameter(IN PCWSTR ParameterName,
-                                                      OUT PCWSTR *Parameter);
-    };
-}
-
-#endif /* __XTOSKRNL_KE_INFO_HH */