X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=8d8a14a00188ae282b5e0b80f61d7e1b4e0364d4;hb=adbdc45e64c40f7d3a022caedeb22f5e95dcd12a;hp=c4b3a2e6813523630e149038e6de2eb7e8bef7cc;hpb=01fbfb424865291e00242681662ed9b20c33a524;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h index c4b3a2e6..8d8a14a0 100644 --- a/Kernel/arch/x86/include/arch.h +++ b/Kernel/arch/x86/include/arch.h @@ -10,6 +10,8 @@ #define KERNEL_BASE 0xC0000000 #define BITS 32 +#define INVLPTR ((void*)-1) + // Allow nested spinlocks? #define STACKED_LOCKS 2 // 0: No, 1: Per-CPU, 2: Per-Thread #define LOCK_DISABLE_INTS 1 @@ -54,7 +56,7 @@ struct sShortSpinlock { // === MACROS === /** - * \brief Halt the CPU + * \brief Halt the CPU (shorter version of yield) */ #define HALT() __asm__ __volatile__ ("hlt") /** @@ -80,12 +82,12 @@ typedef Uint64 tPAddr; typedef Uint32 tVAddr; typedef struct { - Uint gs, fs, es, ds; - Uint edi, esi, ebp, kesp; - Uint ebx, edx, ecx, eax; - Uint int_num, err_code; - Uint eip, cs; - Uint eflags, esp, ss; + Uint32 gs, fs, es, ds; + Uint32 edi, esi, ebp, kesp; + Uint32 ebx, edx, ecx, eax; + Uint32 int_num, err_code; + Uint32 eip, cs; + Uint32 eflags, esp, ss; } tRegs; typedef struct {