Changeset 8 for trunk/hal/i386

Timestamp:

Apr 26, 2017, 2:20:47 PM (7 years ago)

Author:

alain

Message:

Various bugs.

Location:

trunk/hal/i386

Files:

• __do_interrupt.c (modified) (1 diff)
• boot.c (modified) (1 diff)
• hal_types.h (modified) (2 diffs)

trunk/hal/i386/__do_interrupt.c

@@ -23 +23 @@
 #include <types.h>
 #include <kdmsg.h>
-#include <device.h>
+#include <chdev.h>
 #include <interrupt.h>
 #include <thread.h>

trunk/hal/i386/boot.c

@@ -23 +23 @@
 #include <kdmsg.h>
 #include <hardware.h>
-#include <device.h>
+#include <chdev.h>
 #include <cpu.h>
 #include <cpu-internal.h>

trunk/hal/i386/hal_types.h

@@ -185 +185 @@
 #define XPTR_NULL              0
 
-#define PTR_MASK               ((1ULL)<<47)
+#define PTR_MASK               0x0000FFFFFFFFFFFFULL
 
 #define GET_CXY(xp)            ((cxy_t)((xp) >> 48))
@@ -193 +193 @@
 #define XPTR(cxy,ptr)          (((uint64_t)(cxy) << 48) | (((uint64_t)(ptr)) & PTR_MASK))
 
-#define LPA_MASK               ((1ULL)<<47)
+#define LPA_MASK               0X0000FFFFFFFFFFFFULL
 
 #define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> 48))