Add trampoline support and move assembler prototypes

2025-09-19 19:07:27 +02:00
parent 38f1af025c
commit 2b49b23d41
15 changed files with 402 additions and 250 deletions
--- a/xtoskrnl/includes/ar.hh
+++ b/xtoskrnl/includes/ar.hh
@@ -11,6 +11,7 @@

 #include <xtos.hh>

+#include XTOS_ARCH_HEADER(ar, assembly.hh)
 #include XTOS_ARCH_HEADER(ar, cpufunc.hh)
 #include XTOS_ARCH_HEADER(ar, procsup.hh)
 #include XTOS_ARCH_HEADER(ar, traps.hh)
--- a/xtoskrnl/includes/ar/amd64/assembly.hh
+++ b/xtoskrnl/includes/ar/amd64/assembly.hh
@@ -0,0 +1,158 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/ar/amd64/assembly.hh
+ * DESCRIPTION:     Architecture-specific assembler routines forward references
+ * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
+ */
+
+#ifndef __XTOSKRNL_AR_ASSEMBLY_HH
+#define __XTOSKRNL_AR_ASSEMBLY_HH
+
+#include <xtos.hh>
+
+
+/* TrampolineEnableXpa end address to calculate trampoline size */
+XTCLINK PVOID ArEnableExtendedPhysicalAddressingEnd[];
+
+/* TrampolineApStartup end address to calculate trampoline size */
+XTCLINK PVOID ArStartApplicationProcessorEnd[];
+
+
+/* Forward reference for assembler code */
+XTCLINK
+XTCDECL
+VOID
+ArEnableExtendedPhysicalAddressing(IN ULONG_PTR PageMap);
+
+XTCLINK
+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 */
--- a/xtoskrnl/includes/ar/amd64/procsup.hh
+++ b/xtoskrnl/includes/ar/amd64/procsup.hh
@@ -27,6 +27,9 @@ namespace AR

        public:
            STATIC XTAPI PVOID GetBootStack(VOID);
+            STATIC XTAPI VOID GetTrampolineInformation(IN TRAMPOLINE_TYPE TrampolineType,
+                                                       OUT PVOID *TrampolineCode,
+                                                       OUT PULONG_PTR TrampolineSize);
            STATIC XTAPI VOID InitializeProcessor(IN PVOID ProcessorStructures);

        private:
--- a/xtoskrnl/includes/ar/amd64/traps.hh
+++ b/xtoskrnl/includes/ar/amd64/traps.hh
@@ -52,129 +52,4 @@ namespace AR
    };
 }

-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_TRAPS_HH */
--- a/xtoskrnl/includes/ar/i686/assembly.hh
+++ b/xtoskrnl/includes/ar/i686/assembly.hh
@@ -0,0 +1,151 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/ar/i686/assembly.hh
+ * DESCRIPTION:     Architecture-specific assembler routines forward references
+ * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
+ */
+
+#ifndef __XTOSKRNL_AR_ASSEMBLY_HH
+#define __XTOSKRNL_AR_ASSEMBLY_HH
+
+#include <xtos.hh>
+
+
+/* TrampolineApStartup end address to calculate trampoline size */
+XTCLINK PVOID ArStartApplicationProcessorEnd[];
+
+
+/* Forward reference for assembler code */
+XTCLINK
+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 */
--- a/xtoskrnl/includes/ar/i686/procsup.hh
+++ b/xtoskrnl/includes/ar/i686/procsup.hh
@@ -30,6 +30,9 @@ namespace AR

        public:
            STATIC XTAPI PVOID GetBootStack(VOID);
+            STATIC XTAPI VOID GetTrampolineInformation(IN TRAMPOLINE_TYPE TrampolineType,
+                                                       OUT PVOID *TrampolineCode,
+                                                       OUT PULONG_PTR TrampolineSize);
            STATIC XTAPI VOID InitializeProcessor(IN PVOID ProcessorStructures);

        private:
--- a/xtoskrnl/includes/ar/i686/traps.hh
+++ b/xtoskrnl/includes/ar/i686/traps.hh
@@ -49,129 +49,4 @@ namespace AR
    };
 }

-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_TRAPS_HH */